From e5972aedbf1c32957e08fcd3d632bee52542ee78 Mon Sep 17 00:00:00 2001 From: panliming-tuya Date: Thu, 15 Dec 2022 11:47:19 +0800 Subject: [PATCH] Restyled by clang-format --- .../java/AndroidDeviceControllerWrapper.h | 15 +++------------ src/controller/java/CHIPDeviceController-JNI.cpp | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/controller/java/AndroidDeviceControllerWrapper.h b/src/controller/java/AndroidDeviceControllerWrapper.h index f88742258fe9ae..ebad4bc36874c7 100644 --- a/src/controller/java/AndroidDeviceControllerWrapper.h +++ b/src/controller/java/AndroidDeviceControllerWrapper.h @@ -105,15 +105,9 @@ class AndroidDeviceControllerWrapper : public chip::Controller::DevicePairingDel CHIP_ERROR SyncGetKeyValue(const char * key, void * buffer, uint16_t & size) override; CHIP_ERROR SyncDeleteKeyValue(const char * key) override; - chip::Controller::AutoCommissioner * GetAutoCommissioner() - { - return &mAutoCommissioner; - } + chip::Controller::AutoCommissioner * GetAutoCommissioner() { return &mAutoCommissioner; } - chip::Credentials::PartialDACVerifier * GetPartialDACVerifier() - { - return &mPartialDACVerifier; - } + chip::Credentials::PartialDACVerifier * GetPartialDACVerifier() { return &mPartialDACVerifier; } const chip::Controller::CommissioningParameters & GetCommissioningParameters() const { @@ -194,10 +188,7 @@ class AndroidDeviceControllerWrapper : public chip::Controller::DevicePairingDel mDeviceAttestationDelegateBridge = deviceAttestationDelegateBridge; } - DeviceAttestationDelegateBridge * GetDeviceAttestationDelegateBridge() - { - return mDeviceAttestationDelegateBridge; - } + DeviceAttestationDelegateBridge * GetDeviceAttestationDelegateBridge() { return mDeviceAttestationDelegateBridge; } void ClearDeviceAttestationDelegateBridge() { diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp index 816995c347935e..08375e9ed5f633 100644 --- a/src/controller/java/CHIPDeviceController-JNI.cpp +++ b/src/controller/java/CHIPDeviceController-JNI.cpp @@ -642,7 +642,7 @@ JNI_METHOD(void, continueCommissioning) : chip::Credentials::AttestationVerificationResult::kSuccess; chip::DeviceProxy * deviceProxy = reinterpret_cast(devicePtr); err = wrapper->Controller()->ContinueCommissioningAfterDeviceAttestation( - deviceProxy, ignoreAttestationFailure ? chip::Credentials::AttestationVerificationResult::kSuccess : lastAttestationResult); + deviceProxy, ignoreAttestationFailure ? chip::Credentials::AttestationVerificationResult::kSuccess : lastAttestationResult); if (err != CHIP_NO_ERROR) {