From 7d5817e36d266fd48307af7d7a894c7a45451bdc Mon Sep 17 00:00:00 2001 From: Zang MingJie Date: Tue, 16 Nov 2021 01:11:53 +0800 Subject: [PATCH] Do not dispatch packet to Device/DeviceController (#11776) --- examples/all-clusters-app/esp32/main/main.cpp | 1 - src/app/DeviceProxy.h | 35 ----------------- src/app/OperationalDeviceProxy.cpp | 34 +---------------- src/app/OperationalDeviceProxy.h | 22 +---------- src/app/server/AppDelegate.h | 1 - src/app/server/Server.cpp | 26 ------------- src/app/server/Server.h | 9 +---- src/app/tests/TestCommissionManager.cpp | 1 - src/app/util/DataModelHandler.cpp | 34 ----------------- src/app/util/DataModelHandler.h | 11 ------ src/controller/CHIPDeviceController.cpp | 25 ------------ src/controller/CHIPDeviceController.h | 8 +--- src/controller/CommissioneeDeviceProxy.cpp | 35 ----------------- src/controller/CommissioneeDeviceProxy.h | 38 +------------------ src/controller/EmptyDataModelHandler.cpp | 3 -- .../java/AndroidDeviceControllerWrapper.cpp | 4 -- .../java/AndroidDeviceControllerWrapper.h | 5 --- 17 files changed, 6 insertions(+), 286 deletions(-) diff --git a/examples/all-clusters-app/esp32/main/main.cpp b/examples/all-clusters-app/esp32/main/main.cpp index 899178a01e0186..933c3b954dbb90 100644 --- a/examples/all-clusters-app/esp32/main/main.cpp +++ b/examples/all-clusters-app/esp32/main/main.cpp @@ -498,7 +498,6 @@ WiFiWidget pairingWindowLED; class AppCallbacks : public AppDelegate { public: - void OnReceiveError() override { statusLED1.BlinkOnError(); } void OnRendezvousStarted() override { bluetoothLED.Set(true); } void OnRendezvousStopped() override { diff --git a/src/app/DeviceProxy.h b/src/app/DeviceProxy.h index 7303defc1b9960..c4ce1c2f64d37c 100644 --- a/src/app/DeviceProxy.h +++ b/src/app/DeviceProxy.h @@ -104,39 +104,4 @@ class DLL_EXPORT DeviceProxy uint32_t mMrpActiveInterval = CHIP_CONFIG_MRP_DEFAULT_ACTIVE_RETRY_INTERVAL; }; -/** - * This class defines an interface for an object that the user of Device - * can register as a delegate. The delegate object will be called by the - * Device when a new message or status update is received from the corresponding - * CHIP device. - */ -class DLL_EXPORT DeviceStatusDelegate -{ -public: - virtual ~DeviceStatusDelegate() {} - - /** - * @brief - * Called when a message is received from the device. - * - * @param[in] msg Received message buffer. - */ - virtual void OnMessage(System::PacketBufferHandle && msg) = 0; - - /** - * @brief - * Called when response to OpenPairingWindow is received from the device. - * - * @param[in] status CHIP_NO_ERROR on success, or corresponding error. - */ - virtual void OnPairingWindowOpenStatus(CHIP_ERROR status){}; - - /** - * @brief - * Called when device status is updated. - * - */ - virtual void OnStatusChange(void){}; -}; - } // namespace chip diff --git a/src/app/OperationalDeviceProxy.cpp b/src/app/OperationalDeviceProxy.cpp index 95bc97ca3bc720..4aaddb4ce40df7 100644 --- a/src/app/OperationalDeviceProxy.cpp +++ b/src/app/OperationalDeviceProxy.cpp @@ -262,15 +262,7 @@ void OperationalDeviceProxy::Clear() { mCASESession.Clear(); - mState = State::Uninitialized; - mStatusDelegate = nullptr; - if (mInitParams.exchangeMgr) - { - // Ensure that any exchange contexts we have open get closed now, - // because we don't want them to call back in to us after this - // point. - mInitParams.exchangeMgr->CloseAllContextsForDelegate(this); - } + mState = State::Uninitialized; mInitParams = DeviceProxyInitParams(); } @@ -282,34 +274,12 @@ void OperationalDeviceProxy::OnConnectionExpired(SessionHandle session) mSecureSession.ClearValue(); } -CHIP_ERROR OperationalDeviceProxy::OnMessageReceived(Messaging::ExchangeContext * exchange, const PayloadHeader & payloadHeader, - System::PacketBufferHandle && msgBuf) -{ - if (mState == State::SecureConnected) - { - if (mStatusDelegate != nullptr) - { - mStatusDelegate->OnMessage(std::move(msgBuf)); - } - } - return CHIP_NO_ERROR; -} - CHIP_ERROR OperationalDeviceProxy::ShutdownSubscriptions() { return app::InteractionModelEngine::GetInstance()->ShutdownSubscriptions(mInitParams.fabricInfo->GetFabricIndex(), GetDeviceId()); } -OperationalDeviceProxy::~OperationalDeviceProxy() -{ - if (mInitParams.exchangeMgr) - { - // Ensure that any exchange contexts we have open get closed now, - // because we don't want them to call back in to us after this - // point. - mInitParams.exchangeMgr->CloseAllContextsForDelegate(this); - } -} +OperationalDeviceProxy::~OperationalDeviceProxy() {} } // namespace chip diff --git a/src/app/OperationalDeviceProxy.h b/src/app/OperationalDeviceProxy.h index e860972071aad0..fd495860d23ce1 100644 --- a/src/app/OperationalDeviceProxy.h +++ b/src/app/OperationalDeviceProxy.h @@ -42,8 +42,6 @@ namespace chip { -class DeviceStatusDelegate; - struct DeviceProxyInitParams { SessionManager * sessionManager = nullptr; @@ -59,7 +57,7 @@ class OperationalDeviceProxy; typedef void (*OnDeviceConnected)(void * context, DeviceProxy * device); typedef void (*OnDeviceConnectionFailure)(void * context, NodeId deviceId, CHIP_ERROR error); -class DLL_EXPORT OperationalDeviceProxy : public DeviceProxy, Messaging::ExchangeDelegate, public SessionEstablishmentDelegate +class DLL_EXPORT OperationalDeviceProxy : public DeviceProxy, public SessionEstablishmentDelegate { public: virtual ~OperationalDeviceProxy(); @@ -128,16 +126,6 @@ class DLL_EXPORT OperationalDeviceProxy : public DeviceProxy, Messaging::Exchang onFailureCallback, app::TLVDataFilter tlvDataFilter = nullptr) override; void CancelIMResponseHandler(void * commandObj) override; */ - /** - * @brief - * This function is called when a message is received from the corresponding - * device. The message ownership is transferred to the function, and it is expected - * to release the message buffer before returning. - */ - CHIP_ERROR OnMessageReceived(Messaging::ExchangeContext * exchange, const PayloadHeader & payloadHeader, - System::PacketBufferHandle && msgBuf) override; - - void OnResponseTimeout(Messaging::ExchangeContext * ec) override {} /** * Update data of the device. @@ -147,13 +135,6 @@ class DLL_EXPORT OperationalDeviceProxy : public DeviceProxy, Messaging::Exchang */ CHIP_ERROR UpdateDeviceData(const Transport::PeerAddress & addr, uint32_t mrpIdleInterval, uint32_t mrpActiveInterval); - /** - * Set the delegate object which will be called when a message is received. - * The user of this Device object must reset the delegate (by calling - * SetDelegate(nullptr)) before releasing their delegate object. - */ - void SetDelegate(DeviceStatusDelegate * delegate) { mStatusDelegate = delegate; } - PeerId GetPeerId() const { return mPeerId; } bool MatchesSession(SessionHandle session) const { return mSecureSession.HasValue() && mSecureSession.Value() == session; } @@ -196,7 +177,6 @@ class DLL_EXPORT OperationalDeviceProxy : public DeviceProxy, Messaging::Exchang State mState = State::Uninitialized; - DeviceStatusDelegate * mStatusDelegate = nullptr; Optional mSecureSession = Optional::Missing(); uint8_t mSequenceNumber = 0; diff --git a/src/app/server/AppDelegate.h b/src/app/server/AppDelegate.h index 319e6d52c86654..0610963287857f 100644 --- a/src/app/server/AppDelegate.h +++ b/src/app/server/AppDelegate.h @@ -26,7 +26,6 @@ class AppDelegate { public: virtual ~AppDelegate() {} - virtual void OnReceiveError() {} virtual void OnRendezvousStarted() {} virtual void OnRendezvousStopped() {} virtual void OnPairingWindowOpened() {} diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp index 8c773388f7c2e9..fcab2e31444250 100644 --- a/src/app/server/Server.cpp +++ b/src/app/server/Server.cpp @@ -72,7 +72,6 @@ Server Server::sServer; CHIP_ERROR Server::Init(AppDelegate * delegate, uint16_t secureServicePort, uint16_t unsecureServicePort) { - mAppDelegate = delegate; mSecuredServicePort = secureServicePort; mUnsecuredServicePort = unsecureServicePort; @@ -162,11 +161,6 @@ CHIP_ERROR Server::Init(AppDelegate * delegate, uint16_t secureServicePort, uint app::DnssdServer::Instance().StartServer(); #endif - // TODO @pan-apple Use IM protocol ID. - // Register to receive unsolicited legacy ZCL messages from the exchange manager. - err = mExchangeMgr.RegisterUnsolicitedMessageHandlerForProtocol(Protocols::TempZCL::Id, this); - SuccessOrExit(err); - err = mCASEServer.ListenForSessionEstablishment(&mExchangeMgr, &mTransports, chip::DeviceLayer::ConnectivityMgr().GetBleLayer(), &mSessions, &mFabrics, &mSessionIDAllocator); SuccessOrExit(err); @@ -259,24 +253,4 @@ CHIP_ERROR Server::AddTestCommissioning() return err; } -CHIP_ERROR Server::OnMessageReceived(Messaging::ExchangeContext * exchangeContext, const PayloadHeader & payloadHeader, - System::PacketBufferHandle && buffer) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - VerifyOrReturnError(!buffer.IsNull(), err = CHIP_ERROR_INVALID_ARGUMENT); - // TODO: BDX messages will also be possible in the future. - HandleDataModelMessage(exchangeContext, std::move(buffer)); - - return err; -} - -void Server::OnResponseTimeout(Messaging::ExchangeContext * ec) -{ - ChipLogProgress(AppServer, "Failed to receive response"); - if (mAppDelegate != nullptr) - { - mAppDelegate->OnReceiveError(); - } -} - } // namespace chip diff --git a/src/app/server/Server.h b/src/app/server/Server.h index 112f5d769ac9eb..5ca187010f5746 100644 --- a/src/app/server/Server.h +++ b/src/app/server/Server.h @@ -50,7 +50,7 @@ using ServerTransportMgr = chip::TransportMgr; -class Server : public Messaging::ExchangeDelegate +class Server { public: CHIP_ERROR Init(AppDelegate * delegate = nullptr, uint16_t secureServicePort = CHIP_PORT, @@ -130,13 +130,6 @@ class Server : public Messaging::ExchangeDelegate CHIP_ERROR SyncDelete(FabricIndex fabricIndex, const char * key) override { return SyncDeleteKeyValue(key); }; }; - // Messaging::ExchangeDelegate - CHIP_ERROR OnMessageReceived(Messaging::ExchangeContext * exchangeContext, const PayloadHeader & payloadHeader, - System::PacketBufferHandle && buffer) override; - void OnResponseTimeout(Messaging::ExchangeContext * ec) override; - - AppDelegate * mAppDelegate = nullptr; - #if CONFIG_NETWORK_LAYER_BLE Ble::BleLayer * mBleLayer = nullptr; #endif diff --git a/src/app/tests/TestCommissionManager.cpp b/src/app/tests/TestCommissionManager.cpp index 2851af189bcfa7..14f3ec35fb6bde 100644 --- a/src/app/tests/TestCommissionManager.cpp +++ b/src/app/tests/TestCommissionManager.cpp @@ -34,7 +34,6 @@ using chip::Server; // Mock function for linking void InitDataModelHandler(chip::Messaging::ExchangeManager * exchangeMgr) {} -void HandleDataModelMessage(chip::Messaging::ExchangeContext * exchange, chip::System::PacketBufferHandle && buffer) {} namespace { diff --git a/src/app/util/DataModelHandler.cpp b/src/app/util/DataModelHandler.cpp index 07fc47b3846eeb..20f3b0c476942b 100644 --- a/src/app/util/DataModelHandler.cpp +++ b/src/app/util/DataModelHandler.cpp @@ -51,37 +51,3 @@ void InitDataModelHandler(chip::Messaging::ExchangeManager * exchangeManager) #endif #endif } - -void HandleDataModelMessage(Messaging::ExchangeContext * exchange, System::PacketBufferHandle && buffer) -{ -#ifdef USE_ZAP_CONFIG - EmberApsFrame frame; - bool ok = extractApsFrame(buffer->Start(), buffer->DataLength(), &frame) > 0; - if (ok) - { - ChipLogDetail(Zcl, "APS frame processing success!"); - } - else - { - ChipLogDetail(Zcl, "APS frame processing failure!"); - return; - } - - uint8_t * message; - uint16_t messageLen = extractMessage(buffer->Start(), buffer->DataLength(), &message); - ok = emberAfProcessMessage(&frame, - 0, // type - message, messageLen, - exchange, // source identifier - NULL); - - if (ok) - { - ChipLogDetail(Zcl, "Data model processing success!"); - } - else - { - ChipLogDetail(Zcl, "Data model processing failure!"); - } -#endif -} diff --git a/src/app/util/DataModelHandler.h b/src/app/util/DataModelHandler.h index 99cf71873cf8b7..b00cdd8ec5a177 100644 --- a/src/app/util/DataModelHandler.h +++ b/src/app/util/DataModelHandler.h @@ -33,14 +33,3 @@ * */ void InitDataModelHandler(chip::Messaging::ExchangeManager * exchangeMgr); - -/** - * Handle a message that should be processed via our data model processing - * codepath. - * - * @param [in] exchange The exchange on which the message was received. - * @param [in] buffer The buffer holding the message. This function guarantees - * that it will free the buffer before returning. - * - */ -void HandleDataModelMessage(chip::Messaging::ExchangeContext * exchange, chip::System::PacketBufferHandle && buffer); diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp index efa19d5dd09978..138af750d4aa49 100644 --- a/src/controller/CHIPDeviceController.cpp +++ b/src/controller/CHIPDeviceController.cpp @@ -133,8 +133,6 @@ CHIP_ERROR DeviceController::Init(ControllerInitParams params) // TODO Exchange Mgr needs to be able to track multiple delegates. Delegate API should be able to query for the right delegate // to handle events. - ReturnErrorOnFailure( - params.systemState->ExchangeMgr()->RegisterUnsolicitedMessageHandlerForProtocol(Protocols::TempZCL::Id, this)); params.systemState->ExchangeMgr()->SetDelegate(this); #if CHIP_DEVICE_CONFIG_ENABLE_DNSSD @@ -303,29 +301,6 @@ CHIP_ERROR DeviceController::UpdateDevice(NodeId deviceId) #endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD } -CHIP_ERROR DeviceController::OnMessageReceived(Messaging::ExchangeContext * ec, const PayloadHeader & payloadHeader, - System::PacketBufferHandle && msgBuf) -{ - OperationalDeviceProxy * device = nullptr; - - VerifyOrExit(mState == State::Initialized, ChipLogError(Controller, "OnMessageReceived was called in incorrect state")); - VerifyOrExit(ec != nullptr, ChipLogError(Controller, "OnMessageReceived was called with null exchange")); - - device = FindOperationalDevice(ec->GetSessionHandle()); - VerifyOrExit(device != nullptr, ChipLogError(Controller, "OnMessageReceived was called for unknown device object")); - - device->OnMessageReceived(ec, payloadHeader, std::move(msgBuf)); - -exit: - return CHIP_NO_ERROR; -} - -void DeviceController::OnResponseTimeout(Messaging::ExchangeContext * ec) -{ - ChipLogProgress(Controller, "Time out! failed to receive response from Exchange: " ChipLogFormatExchange, - ChipLogValueExchange(ec)); -} - void DeviceController::OnNewConnection(SessionHandle session, Messaging::ExchangeManager * mgr) {} void DeviceController::OnConnectionExpired(SessionHandle session, Messaging::ExchangeManager * mgr) diff --git a/src/controller/CHIPDeviceController.h b/src/controller/CHIPDeviceController.h index 2e854f9e3a57d9..86315339e57964 100644 --- a/src/controller/CHIPDeviceController.h +++ b/src/controller/CHIPDeviceController.h @@ -186,8 +186,7 @@ typedef void (*OnOpenCommissioningWindow)(void * context, NodeId deviceId, CHIP_ * and device pairing information for individual devices). Alternatively, this class can retrieve the * relevant information when the application tries to communicate with the device */ -class DLL_EXPORT DeviceController : public Messaging::ExchangeDelegate, - public Messaging::ExchangeMgrDelegate, +class DLL_EXPORT DeviceController : public Messaging::ExchangeMgrDelegate, #if CHIP_DEVICE_CONFIG_ENABLE_DNSSD public AbstractDnssdDiscoveryController, #endif @@ -402,11 +401,6 @@ class DLL_EXPORT DeviceController : public Messaging::ExchangeDelegate, #endif // CHIP_DEVICE_CONFIG_ENABLE_DNSSD private: - //////////// ExchangeDelegate Implementation /////////////// - CHIP_ERROR OnMessageReceived(Messaging::ExchangeContext * ec, const PayloadHeader & payloadHeader, - System::PacketBufferHandle && msgBuf) override; - void OnResponseTimeout(Messaging::ExchangeContext * ec) override; - OperationalDeviceProxy * FindOperationalDevice(SessionHandle session); OperationalDeviceProxy * FindOperationalDevice(NodeId id); void ReleaseOperationalDevice(OperationalDeviceProxy * device); diff --git a/src/controller/CommissioneeDeviceProxy.cpp b/src/controller/CommissioneeDeviceProxy.cpp index 9ce7c425895751..2cf52d31dccc0d 100644 --- a/src/controller/CommissioneeDeviceProxy.cpp +++ b/src/controller/CommissioneeDeviceProxy.cpp @@ -100,25 +100,6 @@ void CommissioneeDeviceProxy::OnConnectionExpired(SessionHandle session) mSecureSession.ClearValue(); } -CHIP_ERROR CommissioneeDeviceProxy::OnMessageReceived(Messaging::ExchangeContext * exchange, const PayloadHeader & payloadHeader, - System::PacketBufferHandle && msgBuf) -{ - if (mState == ConnectionState::SecureConnected) - { - if (mStatusDelegate != nullptr) - { - mStatusDelegate->OnMessage(std::move(msgBuf)); - } - else - { - HandleDataModelMessage(exchange, std::move(msgBuf)); - } - } - return CHIP_NO_ERROR; -} - -void CommissioneeDeviceProxy::OnResponseTimeout(Messaging::ExchangeContext * ec) {} - CHIP_ERROR CommissioneeDeviceProxy::CloseSession() { ReturnErrorCodeIf(mState != ConnectionState::SecureConnected, CHIP_ERROR_INCORRECT_STATE); @@ -165,18 +146,10 @@ void CommissioneeDeviceProxy::Reset() mState = ConnectionState::NotConnected; mSessionManager = nullptr; - mStatusDelegate = nullptr; mInetLayer = nullptr; #if CONFIG_NETWORK_LAYER_BLE mBleLayer = nullptr; #endif - if (mExchangeMgr) - { - // Ensure that any exchange contexts we have open get closed now, - // because we don't want them to call back in to us after this - // point. - mExchangeMgr->CloseAllContextsForDelegate(this); - } mExchangeMgr = nullptr; ReleaseDAC(); @@ -294,14 +267,6 @@ CHIP_ERROR CommissioneeDeviceProxy::SetPAI(const chip::ByteSpan & pai) CommissioneeDeviceProxy::~CommissioneeDeviceProxy() { - if (mExchangeMgr) - { - // Ensure that any exchange contexts we have open get closed now, - // because we don't want them to call back in to us after this - // point. - mExchangeMgr->CloseAllContextsForDelegate(this); - } - ReleaseDAC(); ReleasePAI(); } diff --git a/src/controller/CommissioneeDeviceProxy.h b/src/controller/CommissioneeDeviceProxy.h index 6eabfb91866f2a..64d4ae27b9dcf4 100644 --- a/src/controller/CommissioneeDeviceProxy.h +++ b/src/controller/CommissioneeDeviceProxy.h @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include @@ -54,8 +53,6 @@ namespace chip { -class DeviceStatusDelegate; - constexpr size_t kOpCSRNonceLength = 32; constexpr size_t kAttestationNonceLength = 32; @@ -82,23 +79,13 @@ struct ControllerDeviceInitParams Controller::DeviceControllerInteractionModelDelegate * imDelegate = nullptr; }; -class CommissioneeDeviceProxy : public DeviceProxy, Messaging::ExchangeDelegate +class CommissioneeDeviceProxy : public DeviceProxy { public: ~CommissioneeDeviceProxy(); CommissioneeDeviceProxy() {} CommissioneeDeviceProxy(const CommissioneeDeviceProxy &) = delete; - /** - * @brief - * Set the delegate object which will be called when a message is received. - * The user of this Device object must reset the delegate (by calling - * SetDelegate(nullptr)) before releasing their delegate object. - * - * @param[in] delegate The pointer to the delegate object. - */ - void SetDelegate(DeviceStatusDelegate * delegate) { mStatusDelegate = delegate; } - /** * @brief * Send the command in internal command sender. @@ -186,27 +173,6 @@ class CommissioneeDeviceProxy : public DeviceProxy, Messaging::ExchangeDelegate */ void OnConnectionExpired(SessionHandle session) override; - /** - * @brief - * This function is called when a message is received from the corresponding CHIP - * device. The message ownership is transferred to the function, and it is expected - * to release the message buffer before returning. - * - * @param[in] exchange The exchange context the message was received - * on. The Device guarantees that it will call - * Close() on exchange when it's done processing - * the message. - * @param[in] payloadHeader Reference to payload header in the message - * @param[in] msgBuf The message buffer - */ - CHIP_ERROR OnMessageReceived(Messaging::ExchangeContext * exchange, const PayloadHeader & payloadHeader, - System::PacketBufferHandle && msgBuf) override; - - /** - * @brief ExchangeDelegate implementation of OnResponseTimeout. - */ - void OnResponseTimeout(Messaging::ExchangeContext * exchange) override; - /** * In case there exists an open session to the device, mark it as expired. */ @@ -335,8 +301,6 @@ class CommissioneeDeviceProxy : public DeviceProxy, Messaging::ExchangeDelegate PASESession mPairing; - DeviceStatusDelegate * mStatusDelegate = nullptr; - SessionManager * mSessionManager = nullptr; Messaging::ExchangeManager * mExchangeMgr = nullptr; diff --git a/src/controller/EmptyDataModelHandler.cpp b/src/controller/EmptyDataModelHandler.cpp index 63d12a2c77c1d2..053979fb16d65c 100644 --- a/src/controller/EmptyDataModelHandler.cpp +++ b/src/controller/EmptyDataModelHandler.cpp @@ -25,6 +25,3 @@ #include __attribute__((weak)) void InitDataModelHandler(chip::Messaging::ExchangeManager * exchangeMgr) {} -__attribute__((weak)) void HandleDataModelMessage(chip::Messaging::ExchangeContext * exchange, - chip::System::PacketBufferHandle && buffer) -{} diff --git a/src/controller/java/AndroidDeviceControllerWrapper.cpp b/src/controller/java/AndroidDeviceControllerWrapper.cpp index 7a5c78e20560c9..8b8ae347ce60c6 100644 --- a/src/controller/java/AndroidDeviceControllerWrapper.cpp +++ b/src/controller/java/AndroidDeviceControllerWrapper.cpp @@ -327,10 +327,6 @@ CHIP_ERROR AndroidDeviceControllerWrapper::InitializeOperationalCredentialsIssue return CHIP_NO_ERROR; } -void AndroidDeviceControllerWrapper::OnMessage(chip::System::PacketBufferHandle && msg) {} - -void AndroidDeviceControllerWrapper::OnStatusChange(void) {} - CHIP_ERROR AndroidDeviceControllerWrapper::SyncGetKeyValue(const char * key, void * value, uint16_t & size) { ChipLogProgress(chipTool, "KVS: Getting key %s", key); diff --git a/src/controller/java/AndroidDeviceControllerWrapper.h b/src/controller/java/AndroidDeviceControllerWrapper.h index 83f35ba06cb60c..7580062f72967e 100644 --- a/src/controller/java/AndroidDeviceControllerWrapper.h +++ b/src/controller/java/AndroidDeviceControllerWrapper.h @@ -35,7 +35,6 @@ * Generally it contains the DeviceController class itself, plus any related delegates/callbacks. */ class AndroidDeviceControllerWrapper : public chip::Controller::DevicePairingDelegate, - public chip::DeviceStatusDelegate, public chip::Controller::OperationalCredentialsDelegate, public chip::PersistentStorageDelegate, public chip::FabricStorage @@ -70,10 +69,6 @@ class AndroidDeviceControllerWrapper : public chip::Controller::DevicePairingDel void SetFabricIdForNextNOCRequest(chip::FabricId fabricId) override { mNextFabricId = fabricId; } - // DeviceStatusDelegate implementation - void OnMessage(chip::System::PacketBufferHandle && msg) override; - void OnStatusChange(void) override; - // PersistentStorageDelegate implementation CHIP_ERROR SyncSetKeyValue(const char * key, const void * value, uint16_t size) override; CHIP_ERROR SyncGetKeyValue(const char * key, void * buffer, uint16_t & size) override;