Merge changes Iebab49ea,I61af2704 into main

* changes:
  [android] exit ot-daemon when factoryreset (#2173)
  [Thread] suppress unused-unfction

2 files changed, 12 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index 0a76d7b2..2b818cbd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -122,6 +122,7 @@ cc_defaults {
     cflags: [
         "-Wall",
         "-Wextra",
+        "-Wno-unused-function",
 
         // The HAL client implementation requires features which are
         // available on only 31+, but it's guaranteed that ot-daemon
diff --git a/src/agent/main.cpp b/src/agent/main.cpp
index 5409671d..4ed5e277 100644
--- a/src/agent/main.cpp
+++ b/src/agent/main.cpp
@@ -78,7 +78,9 @@ enum
     OTBR_OPT_REST_LISTEN_PORT,
 };
 
-static jmp_buf            sResetJump;
+#ifndef __ANDROID__
+static jmp_buf sResetJump;
+#endif
 static otbr::Application *gApp = nullptr;
 
 void                       __gcov_flush();
@@ -317,12 +319,19 @@ void otPlatReset(otInstance *aInstance)
     gApp->Deinit();
     gApp = nullptr;
 
+#ifndef __ANDROID__
     longjmp(sResetJump, 1);
     assert(false);
+#else
+    // Exits immediately on Android. The Android system_server will receive the
+    // signal and decide whether (and how) to restart the ot-daemon
+    exit(0);
+#endif
 }
 
 int main(int argc, char *argv[])
 {
+#ifndef __ANDROID__
     if (setjmp(sResetJump))
     {
         std::vector<char *> args = AppendAutoAttachDisableArg(argc, argv);
@@ -334,6 +343,6 @@ int main(int argc, char *argv[])
 
         execvp(args[0], args.data());
     }
-
+#endif
     return realmain(argc, argv);
 }