From 591826a6ce1560141047a20857dca7a7d23f5c09 Mon Sep 17 00:00:00 2001
From: xylophone21 <xylophone21@gmail.com>
Date: Tue, 21 Dec 2021 15:34:00 +0800
Subject: [PATCH 1/6] added restart server on android tv server

---
 .../tcl/chip/chiptvserver/MainActivity.java   | 10 +++
 .../chiptvserver/service/MatterServant.java   | 11 ++-
 .../app/src/main/res/layout/activity_main.xml | 10 +++
 .../server/java/AndroidAppServerWrapper.cpp   |  8 ++
 src/app/server/java/AndroidAppServerWrapper.h |  2 +
 src/app/server/java/CHIPAppServer-JNI.cpp     |  9 +++
 .../src/chip/appserver/ChipAppServer.java     |  2 +
 src/lib/support/BUILD.gn                      |  2 +
 src/lib/support/ChipThreadWork.cpp            | 73 +++++++++++++++++++
 src/lib/support/ChipThreadWork.h              | 37 ++++++++++
 10 files changed, 163 insertions(+), 1 deletion(-)
 create mode 100644 src/lib/support/ChipThreadWork.cpp
 create mode 100644 src/lib/support/ChipThreadWork.h

diff --git a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/MainActivity.java b/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/MainActivity.java
index 7475aa4e7e8e85..a32b7728260770 100644
--- a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/MainActivity.java
+++ b/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/MainActivity.java
@@ -2,9 +2,13 @@
 
 import android.graphics.Bitmap;
 import android.os.Bundle;
+import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
+
+import com.tcl.chip.chiptvserver.service.MatterServant;
+
 import chip.setuppayload.DiscoveryCapability;
 import chip.setuppayload.SetupPayload;
 import chip.setuppayload.SetupPayloadParser;
@@ -23,6 +27,12 @@ protected void onCreate(Bundle savedInstanceState) {
     mQrCodeImg = findViewById(R.id.qrCodeImg);
     mQrCodeTxt = findViewById(R.id.qrCodeTxt);
     mManualPairingCodeTxt = findViewById(R.id.manualPairingCodeTxt);
+    findViewById(R.id.resetBtn).setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View view) {
+        MatterServant.get().restart();
+      }
+    });
 
     // TODO: Get these parameters from PreferencesConfigurationManager
     HashSet<DiscoveryCapability> discoveryCapabilities = new HashSet<>();
diff --git a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/service/MatterServant.java b/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/service/MatterServant.java
index e6637744ab9dd3..e5e4b97e0fa02f 100644
--- a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/service/MatterServant.java
+++ b/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/service/MatterServant.java
@@ -20,6 +20,8 @@
 
 public class MatterServant {
 
+  private ChipAppServer chipAppServer;
+
   private MatterServant() {}
 
   private static class SingletonHolder {
@@ -49,7 +51,14 @@ public void init(@NonNull Context context) {
             new NsdManagerServiceResolver(applicationContext),
             new ChipMdnsCallbackImpl());
 
-    ChipAppServer chipAppServer = new ChipAppServer();
+    chipAppServer = new ChipAppServer();
+    chipAppServer.startApp();
+  }
+
+
+
+  public void restart() {
+    chipAppServer.stopApp();
     chipAppServer.startApp();
   }
 }
diff --git a/examples/tv-app/android/App/app/src/main/res/layout/activity_main.xml b/examples/tv-app/android/App/app/src/main/res/layout/activity_main.xml
index 65b4ee55984ea5..f26237c235c4eb 100644
--- a/examples/tv-app/android/App/app/src/main/res/layout/activity_main.xml
+++ b/examples/tv-app/android/App/app/src/main/res/layout/activity_main.xml
@@ -32,4 +32,14 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
+    <Button
+        android:id="@+id/resetBtn"
+        android:text="Reset"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@+id/manualPairingCodeTxt"
+        android:layout_marginTop="20dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/app/server/java/AndroidAppServerWrapper.cpp b/src/app/server/java/AndroidAppServerWrapper.cpp
index f32c9bdd25c393..d8d4b66d0b85cf 100644
--- a/src/app/server/java/AndroidAppServerWrapper.cpp
+++ b/src/app/server/java/AndroidAppServerWrapper.cpp
@@ -62,3 +62,11 @@ CHIP_ERROR ChipAndroidAppInit(void)
     }
     return err;
 }
+
+CHIP_ERROR ChipAndroidAppShutdown(void)
+{
+    chip::Server::GetInstance().Shutdown();
+    chip::Platform::MemoryShutdown();
+
+    return CHIP_NO_ERROR;
+}
diff --git a/src/app/server/java/AndroidAppServerWrapper.h b/src/app/server/java/AndroidAppServerWrapper.h
index c128328564920c..def7d02769d5b9 100644
--- a/src/app/server/java/AndroidAppServerWrapper.h
+++ b/src/app/server/java/AndroidAppServerWrapper.h
@@ -22,6 +22,8 @@
 
 CHIP_ERROR ChipAndroidAppInit(void);
 
+CHIP_ERROR ChipAndroidAppShutdown(void);
+
 jint AndroidAppServerJNI_OnLoad(JavaVM * jvm, void * reserved);
 
 void AndroidAppServerJNI_OnUnload(JavaVM * jvm, void * reserved);
diff --git a/src/app/server/java/CHIPAppServer-JNI.cpp b/src/app/server/java/CHIPAppServer-JNI.cpp
index 57301485269b8d..78dce53f084491 100644
--- a/src/app/server/java/CHIPAppServer-JNI.cpp
+++ b/src/app/server/java/CHIPAppServer-JNI.cpp
@@ -29,6 +29,7 @@
 #include <lib/support/CodeUtils.h>
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
+#include <lib/support/ChipThreadWork.h>
 #include <platform/CHIPDeviceConfig.h>
 #include <platform/ConfigurationManager.h>
 #include <platform/ConnectivityManager.h>
@@ -130,6 +131,14 @@ JNI_METHOD(jboolean, startApp)(JNIEnv * env, jobject self)
     return JNI_TRUE;
 }
 
+JNI_METHOD(jboolean, stopApp)(JNIEnv * env, jobject self)
+{
+    chip::ThreadWork::ChipMainThreadScheduleAndWait([&] {
+        ChipAndroidAppShutdown();
+    });
+    return JNI_TRUE;
+}
+
 void * IOThreadAppMain(void * arg)
 {
     JNIEnv * env;
diff --git a/src/app/server/java/src/chip/appserver/ChipAppServer.java b/src/app/server/java/src/chip/appserver/ChipAppServer.java
index 79a8d5eb23751c..a954dc1f9d8379 100644
--- a/src/app/server/java/src/chip/appserver/ChipAppServer.java
+++ b/src/app/server/java/src/chip/appserver/ChipAppServer.java
@@ -22,4 +22,6 @@ public class ChipAppServer {
   private static final String TAG = ChipAppServer.class.getSimpleName();
 
   public native boolean startApp();
+
+  public native boolean stopApp();
 }
diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn
index fe8c92dd4909e9..b0e76395a8086f 100644
--- a/src/lib/support/BUILD.gn
+++ b/src/lib/support/BUILD.gn
@@ -113,6 +113,8 @@ static_library("support") {
     "verhoeff/Verhoeff16.cpp",
     "verhoeff/Verhoeff32.cpp",
     "verhoeff/Verhoeff36.cpp",
+    "ChipThreadWork.cpp",
+    "ChipThreadWork.h",
   ]
 
   # added JNI helper on android
diff --git a/src/lib/support/ChipThreadWork.cpp b/src/lib/support/ChipThreadWork.cpp
new file mode 100644
index 00000000000000..732ec05886015a
--- /dev/null
+++ b/src/lib/support/ChipThreadWork.cpp
@@ -0,0 +1,73 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "ChipThreadWork.h"
+
+#ifdef __APPLE__
+#include <dispatch/dispatch.h>
+#else
+#include <semaphore.h>
+#endif
+
+#include <platform/CHIPDeviceLayer.h>
+
+namespace chip {
+namespace ThreadWork {
+namespace {
+
+struct WorkData
+{
+    WorkCallback callback;
+#ifdef __APPLE__
+    dispatch_semaphore_t done;
+
+    WorkData() { done = dispatch_semaphore_create(0); }
+    ~WorkData() { dispatch_release(done); }
+    void Post() { dispatch_semaphore_signal(done); }
+    void Wait() { dispatch_semaphore_wait(done, DISPATCH_TIME_FOREVER); }
+#else
+    sem_t done;
+
+    WorkData() { sem_init(&done, 0 /* shared */, 0); }
+    ~WorkData() { sem_destroy(&done); }
+    void Post() { sem_post(&done); }
+    void Wait() { sem_wait(&done); }
+#endif
+};
+
+void PerformWork(intptr_t arg)
+{
+    WorkData * work = reinterpret_cast<WorkData *>(arg);
+
+    work->callback();
+    work->Post();
+}
+
+} // namespace
+
+void ChipMainThreadScheduleAndWait(WorkCallback callback)
+{
+    WorkData workdata;
+    workdata.callback = callback;
+
+    chip::DeviceLayer::PlatformMgr().ScheduleWork(PerformWork, reinterpret_cast<intptr_t>(&workdata));
+
+    workdata.Wait();
+}
+
+} // namespace ThreadWork
+} // namespace chip
diff --git a/src/lib/support/ChipThreadWork.h b/src/lib/support/ChipThreadWork.h
new file mode 100644
index 00000000000000..51032fc98cbfcb
--- /dev/null
+++ b/src/lib/support/ChipThreadWork.h
@@ -0,0 +1,37 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <functional>
+
+#include <lib/core/CHIPError.h>
+
+namespace chip {
+namespace ThreadWork {
+
+using WorkCallback = std::function<void()>;
+
+/// Schedules a task to be run on the CHIP main thread and waits for that
+/// task to be complete.
+///
+/// Returns only once callback has been completely executed (callback
+/// will not be running anymore when this returns).
+void ChipMainThreadScheduleAndWait(WorkCallback callback);
+
+} // namespace python
+} // namespace chip

From effb7af303d88652e18274afeb9e7af96c5886ca Mon Sep 17 00:00:00 2001
From: xylophone21 <xylophone21@gmail.com>
Date: Tue, 21 Dec 2021 15:49:05 +0800
Subject: [PATCH 2/6] fix restyled-io and ci errors

---
 .../tcl/chip/chiptvserver/MainActivity.java    | 18 +++++++++---------
 .../chiptvserver/service/MatterServant.java    |  2 --
 src/app/server/java/CHIPAppServer-JNI.cpp      |  6 ++----
 src/lib/support/BUILD.gn                       |  4 ++--
 src/lib/support/ChipThreadWork.h               |  2 +-
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/MainActivity.java b/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/MainActivity.java
index a32b7728260770..e71a4663ea412d 100644
--- a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/MainActivity.java
+++ b/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/MainActivity.java
@@ -6,12 +6,10 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
-
-import com.tcl.chip.chiptvserver.service.MatterServant;
-
 import chip.setuppayload.DiscoveryCapability;
 import chip.setuppayload.SetupPayload;
 import chip.setuppayload.SetupPayloadParser;
+import com.tcl.chip.chiptvserver.service.MatterServant;
 import java.util.HashSet;
 
 public class MainActivity extends AppCompatActivity {
@@ -27,12 +25,14 @@ protected void onCreate(Bundle savedInstanceState) {
     mQrCodeImg = findViewById(R.id.qrCodeImg);
     mQrCodeTxt = findViewById(R.id.qrCodeTxt);
     mManualPairingCodeTxt = findViewById(R.id.manualPairingCodeTxt);
-    findViewById(R.id.resetBtn).setOnClickListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View view) {
-        MatterServant.get().restart();
-      }
-    });
+    findViewById(R.id.resetBtn)
+        .setOnClickListener(
+            new View.OnClickListener() {
+              @Override
+              public void onClick(View view) {
+                MatterServant.get().restart();
+              }
+            });
 
     // TODO: Get these parameters from PreferencesConfigurationManager
     HashSet<DiscoveryCapability> discoveryCapabilities = new HashSet<>();
diff --git a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/service/MatterServant.java b/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/service/MatterServant.java
index e5e4b97e0fa02f..fffb60be46040b 100644
--- a/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/service/MatterServant.java
+++ b/examples/tv-app/android/App/app/src/main/java/com/tcl/chip/chiptvserver/service/MatterServant.java
@@ -55,8 +55,6 @@ public void init(@NonNull Context context) {
     chipAppServer.startApp();
   }
 
-
-
   public void restart() {
     chipAppServer.stopApp();
     chipAppServer.startApp();
diff --git a/src/app/server/java/CHIPAppServer-JNI.cpp b/src/app/server/java/CHIPAppServer-JNI.cpp
index 78dce53f084491..9340e854f85224 100644
--- a/src/app/server/java/CHIPAppServer-JNI.cpp
+++ b/src/app/server/java/CHIPAppServer-JNI.cpp
@@ -26,10 +26,10 @@
 #include <lib/core/CHIPError.h>
 #include <lib/support/CHIPJNIError.h>
 #include <lib/support/CHIPMem.h>
+#include <lib/support/ChipThreadWork.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
-#include <lib/support/ChipThreadWork.h>
 #include <platform/CHIPDeviceConfig.h>
 #include <platform/ConfigurationManager.h>
 #include <platform/ConnectivityManager.h>
@@ -133,9 +133,7 @@ JNI_METHOD(jboolean, startApp)(JNIEnv * env, jobject self)
 
 JNI_METHOD(jboolean, stopApp)(JNIEnv * env, jobject self)
 {
-    chip::ThreadWork::ChipMainThreadScheduleAndWait([&] {
-        ChipAndroidAppShutdown();
-    });
+    chip::ThreadWork::ChipMainThreadScheduleAndWait([&] { ChipAndroidAppShutdown(); });
     return JNI_TRUE;
 }
 
diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn
index b0e76395a8086f..355cfc4169d602 100644
--- a/src/lib/support/BUILD.gn
+++ b/src/lib/support/BUILD.gn
@@ -69,6 +69,8 @@ static_library("support") {
     "CHIPMemString.h",
     "CHIPPlatformMemory.cpp",
     "CHIPPlatformMemory.h",
+    "ChipThreadWork.cpp",
+    "ChipThreadWork.h",
     "CodeUtils.h",
     "DLLUtil.h",
     "Defer.h",
@@ -113,8 +115,6 @@ static_library("support") {
     "verhoeff/Verhoeff16.cpp",
     "verhoeff/Verhoeff32.cpp",
     "verhoeff/Verhoeff36.cpp",
-    "ChipThreadWork.cpp",
-    "ChipThreadWork.h",
   ]
 
   # added JNI helper on android
diff --git a/src/lib/support/ChipThreadWork.h b/src/lib/support/ChipThreadWork.h
index 51032fc98cbfcb..88e7209c150498 100644
--- a/src/lib/support/ChipThreadWork.h
+++ b/src/lib/support/ChipThreadWork.h
@@ -33,5 +33,5 @@ using WorkCallback = std::function<void()>;
 /// will not be running anymore when this returns).
 void ChipMainThreadScheduleAndWait(WorkCallback callback);
 
-} // namespace python
+} // namespace ThreadWork
 } // namespace chip

From e2a135af2ac39f32eb805717b4cef428b8e3b5f2 Mon Sep 17 00:00:00 2001
From: xylophone21 <xylophone21@gmail.com>
Date: Tue, 21 Dec 2021 15:51:36 +0800
Subject: [PATCH 3/6] ChipThreadWork can only work on android & linux

---
 src/lib/support/BUILD.gn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn
index 355cfc4169d602..4701b01c45efcf 100644
--- a/src/lib/support/BUILD.gn
+++ b/src/lib/support/BUILD.gn
@@ -69,8 +69,6 @@ static_library("support") {
     "CHIPMemString.h",
     "CHIPPlatformMemory.cpp",
     "CHIPPlatformMemory.h",
-    "ChipThreadWork.cpp",
-    "ChipThreadWork.h",
     "CodeUtils.h",
     "DLLUtil.h",
     "Defer.h",
@@ -121,6 +119,8 @@ static_library("support") {
   if (current_os == "android") {
     sources += [
       "CHIPJNIError.h",
+      "ChipThreadWork.cpp",
+      "ChipThreadWork.h",
       "JniReferences.cpp",
       "JniReferences.h",
       "JniTypeWrappers.h",

From 23c7b806746831f4d7bfc0ca2ea4a99e02c7e958 Mon Sep 17 00:00:00 2001
From: xylophone21 <xylophone21@gmail.com>
Date: Wed, 22 Dec 2021 16:47:38 +0800
Subject: [PATCH 4/6] remove chip thread work on darwin because there is no
 "non-main" CHIP thread on darwin

---
 src/lib/support/ChipThreadWork.cpp | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/lib/support/ChipThreadWork.cpp b/src/lib/support/ChipThreadWork.cpp
index 732ec05886015a..334e3052211e42 100644
--- a/src/lib/support/ChipThreadWork.cpp
+++ b/src/lib/support/ChipThreadWork.cpp
@@ -16,14 +16,8 @@
  */
 
 #include "ChipThreadWork.h"
-
-#ifdef __APPLE__
-#include <dispatch/dispatch.h>
-#else
-#include <semaphore.h>
-#endif
-
 #include <platform/CHIPDeviceLayer.h>
+#include <semaphore.h>
 
 namespace chip {
 namespace ThreadWork {
@@ -32,21 +26,12 @@ namespace {
 struct WorkData
 {
     WorkCallback callback;
-#ifdef __APPLE__
-    dispatch_semaphore_t done;
-
-    WorkData() { done = dispatch_semaphore_create(0); }
-    ~WorkData() { dispatch_release(done); }
-    void Post() { dispatch_semaphore_signal(done); }
-    void Wait() { dispatch_semaphore_wait(done, DISPATCH_TIME_FOREVER); }
-#else
     sem_t done;
 
     WorkData() { sem_init(&done, 0 /* shared */, 0); }
     ~WorkData() { sem_destroy(&done); }
     void Post() { sem_post(&done); }
     void Wait() { sem_wait(&done); }
-#endif
 };
 
 void PerformWork(intptr_t arg)

From c73ddcb41a126c0c57a7f551d185ba9bf06ba0e6 Mon Sep 17 00:00:00 2001
From: xylophone21 <xylophone21@gmail.com>
Date: Thu, 23 Dec 2021 19:01:35 +0800
Subject: [PATCH 5/6] move ChipThreadWork to server/java folder as
 bzbarsky-apple's suggestion because is it not suit for all platforms

---
 src/app/server/java/BUILD.gn                            | 2 ++
 src/app/server/java/CHIPAppServer-JNI.cpp               | 2 +-
 src/{lib/support => app/server/java}/ChipThreadWork.cpp | 0
 src/{lib/support => app/server/java}/ChipThreadWork.h   | 0
 src/lib/support/BUILD.gn                                | 2 --
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename src/{lib/support => app/server/java}/ChipThreadWork.cpp (100%)
 rename src/{lib/support => app/server/java}/ChipThreadWork.h (100%)

diff --git a/src/app/server/java/BUILD.gn b/src/app/server/java/BUILD.gn
index dd40c94eaf1862..166cdd82ade5a2 100644
--- a/src/app/server/java/BUILD.gn
+++ b/src/app/server/java/BUILD.gn
@@ -27,6 +27,8 @@ static_library("jni") {
     "AndroidAppServerWrapper.cpp",
     "AndroidAppServerWrapper.h",
     "CHIPAppServer-JNI.cpp",
+    "ChipThreadWork.cpp",
+    "ChipThreadWork.h",
   ]
 
   deps = [
diff --git a/src/app/server/java/CHIPAppServer-JNI.cpp b/src/app/server/java/CHIPAppServer-JNI.cpp
index 9340e854f85224..66093695226f97 100644
--- a/src/app/server/java/CHIPAppServer-JNI.cpp
+++ b/src/app/server/java/CHIPAppServer-JNI.cpp
@@ -22,11 +22,11 @@
  *
  */
 #include "AndroidAppServerWrapper.h"
+#include "ChipThreadWork.h"
 #include <jni.h>
 #include <lib/core/CHIPError.h>
 #include <lib/support/CHIPJNIError.h>
 #include <lib/support/CHIPMem.h>
-#include <lib/support/ChipThreadWork.h>
 #include <lib/support/CodeUtils.h>
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
diff --git a/src/lib/support/ChipThreadWork.cpp b/src/app/server/java/ChipThreadWork.cpp
similarity index 100%
rename from src/lib/support/ChipThreadWork.cpp
rename to src/app/server/java/ChipThreadWork.cpp
diff --git a/src/lib/support/ChipThreadWork.h b/src/app/server/java/ChipThreadWork.h
similarity index 100%
rename from src/lib/support/ChipThreadWork.h
rename to src/app/server/java/ChipThreadWork.h
diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn
index 4701b01c45efcf..fe8c92dd4909e9 100644
--- a/src/lib/support/BUILD.gn
+++ b/src/lib/support/BUILD.gn
@@ -119,8 +119,6 @@ static_library("support") {
   if (current_os == "android") {
     sources += [
       "CHIPJNIError.h",
-      "ChipThreadWork.cpp",
-      "ChipThreadWork.h",
       "JniReferences.cpp",
       "JniReferences.h",
       "JniTypeWrappers.h",

From a35a6c742c76487f0fbe52d74f70f2b4681052e9 Mon Sep 17 00:00:00 2001
From: xylophone21 <xylophone21@gmail.com>
Date: Wed, 5 Jan 2022 13:55:51 +0800
Subject: [PATCH 6/6] change ChipAndroidAppShutdown to void and remove no mean
 [&]

---
 src/app/server/java/AndroidAppServerWrapper.cpp | 4 +---
 src/app/server/java/AndroidAppServerWrapper.h   | 2 +-
 src/app/server/java/CHIPAppServer-JNI.cpp       | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/app/server/java/AndroidAppServerWrapper.cpp b/src/app/server/java/AndroidAppServerWrapper.cpp
index d8d4b66d0b85cf..2dd91246d8f942 100644
--- a/src/app/server/java/AndroidAppServerWrapper.cpp
+++ b/src/app/server/java/AndroidAppServerWrapper.cpp
@@ -63,10 +63,8 @@ CHIP_ERROR ChipAndroidAppInit(void)
     return err;
 }
 
-CHIP_ERROR ChipAndroidAppShutdown(void)
+void ChipAndroidAppShutdown(void)
 {
     chip::Server::GetInstance().Shutdown();
     chip::Platform::MemoryShutdown();
-
-    return CHIP_NO_ERROR;
 }
diff --git a/src/app/server/java/AndroidAppServerWrapper.h b/src/app/server/java/AndroidAppServerWrapper.h
index def7d02769d5b9..ef530de60e232c 100644
--- a/src/app/server/java/AndroidAppServerWrapper.h
+++ b/src/app/server/java/AndroidAppServerWrapper.h
@@ -22,7 +22,7 @@
 
 CHIP_ERROR ChipAndroidAppInit(void);
 
-CHIP_ERROR ChipAndroidAppShutdown(void);
+void ChipAndroidAppShutdown(void);
 
 jint AndroidAppServerJNI_OnLoad(JavaVM * jvm, void * reserved);
 
diff --git a/src/app/server/java/CHIPAppServer-JNI.cpp b/src/app/server/java/CHIPAppServer-JNI.cpp
index 66093695226f97..52f9a55c78a947 100644
--- a/src/app/server/java/CHIPAppServer-JNI.cpp
+++ b/src/app/server/java/CHIPAppServer-JNI.cpp
@@ -133,7 +133,7 @@ JNI_METHOD(jboolean, startApp)(JNIEnv * env, jobject self)
 
 JNI_METHOD(jboolean, stopApp)(JNIEnv * env, jobject self)
 {
-    chip::ThreadWork::ChipMainThreadScheduleAndWait([&] { ChipAndroidAppShutdown(); });
+    chip::ThreadWork::ChipMainThreadScheduleAndWait([] { ChipAndroidAppShutdown(); });
     return JNI_TRUE;
 }