Add reset api for android app server (#28398)

Signed-off-by: Jaehoon You <jaehoon.you@samsung.com> Signed-off-by: Charles Kim <chulspro.kim@samsung.com> Co-authored-by: Jaehoon You <jaehoon.you@samsung.com>
project-chip · Feb 15, 2024 · 4639954 · 4639954
1 parent 3fceeae
commit 4639954
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 0 deletions.
diff --git a/...roid/App/core/matter/src/main/java/com/matter/virtual/device/app/core/matter/MatterApp.kt b/...roid/App/core/matter/src/main/java/com/matter/virtual/device/app/core/matter/MatterApp.kt
@@ -45,4 +45,8 @@ class MatterApp @Inject constructor() {
  fun stop() {
  chipAppServer?.stopApp()
  }
+
+ fun reset() {
+ chipAppServer?.resetApp()
+ }
 }
diff --git a/src/app/server/java/AndroidAppServerWrapper.cpp b/src/app/server/java/AndroidAppServerWrapper.cpp
@@ -80,3 +80,8 @@ void ChipAndroidAppShutdown(void)
  chip::Server::GetInstance().Shutdown();
  chip::Platform::MemoryShutdown();
 }
+
+void ChipAndroidAppReset(void)
+{
+ chip::Server::GetInstance().ScheduleFactoryReset();
+}
diff --git a/src/app/server/java/AndroidAppServerWrapper.h b/src/app/server/java/AndroidAppServerWrapper.h
@@ -25,6 +25,8 @@ CHIP_ERROR ChipAndroidAppInit(AppDelegate * appDelegate = nullptr);
 
 void ChipAndroidAppShutdown(void);
 
+void ChipAndroidAppReset(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
@@ -165,6 +165,14 @@ JNI_METHOD(jboolean, stopApp)(JNIEnv * env, jobject self)
  return JNI_TRUE;
 }
 
+JNI_METHOD(jboolean, resetApp)(JNIEnv * env, jobject self)
+{
+ chip::DeviceLayer::StackLock lock;
+ ChipAndroidAppReset();
+
+ 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
@@ -39,4 +39,6 @@ public ChipFabricProvider getFabricProvider() {
  public native boolean startAppWithDelegate(ChipAppServerDelegate appDelegate);
 
  public native boolean stopApp();
+
+ public native boolean resetApp();
 }