diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-02 18:47:47 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-02 18:47:47 +0000 |
| commit | 64ec8442e3a60f8f2e1308fad7bd574d53f109b1 (patch) | |
| tree | 46c7b12d768b2a65908266476224d0bd03e6a483 | |
| parent | 7180b40fff4a13697fb34a5646144e2797b360fa (diff) | |
| parent | 16fbf4c447db797ebf4f9d6654b65dfc17275c01 (diff) | |
| download | ot-br-posix-64ec8442e3a60f8f2e1308fad7bd574d53f109b1.tar.gz | |
Snap for 11397440 from 16fbf4c447db797ebf4f9d6654b65dfc17275c01 to mainline-ipsec-releaseaml_ips_341611000
Change-Id: I1a58bf24fd3439dd566bc35aebd2151146ff5072
| -rw-r--r-- | src/android/otdaemon_server.cpp | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/android/otdaemon_server.cpp b/src/android/otdaemon_server.cpp index 1af673a8..4e695be9 100644 --- a/src/android/otdaemon_server.cpp +++ b/src/android/otdaemon_server.cpp @@ -318,9 +318,18 @@ void OtDaemonServer::Process(const MainloopContext &aMainloop) Status OtDaemonServer::initialize(const ScopedFileDescriptor &aTunFd, const bool enabled) { - otbrLogDebug("OT daemon is initialized by the binder client (tunFd=%d)", aTunFd.get()); - mTunFd = aTunFd.dup(); - mThreadEnabled = enabled ? IOtDaemon::OT_STATE_ENABLED : IOtDaemon::OT_STATE_DISABLED; + otbrLogInfo("OT daemon is initialized by system server (tunFd=%d, enabled=%s)", + aTunFd.get(), enabled ? "true" : "false"); + mTunFd = aTunFd.dup(); + + if (enabled) + { + enableThread(nullptr /* aReceiver */); + } + else + { + updateThreadEnabledState(enabled, nullptr /* Receiver */); + } return Status::ok(); } @@ -328,7 +337,10 @@ Status OtDaemonServer::initialize(const ScopedFileDescriptor &aTunFd, const bool void OtDaemonServer::updateThreadEnabledState(const int enabled, const std::shared_ptr<IOtStatusReceiver> &aReceiver) { mThreadEnabled = enabled; - aReceiver->onSuccess(); + if (aReceiver != nullptr) + { + aReceiver->onSuccess(); + } if (mCallback != nullptr) { |