From b0046f2825b773d87e29d5ce23f26b65af956d3c Mon Sep 17 00:00:00 2001 From: "zeng.li" Date: Fri, 20 May 2022 20:39:14 +0800 Subject: [PATCH] restyled --- src/app/server/java/BUILD.gn | 4 ++-- src/app/server/java/ChipFabricProvider-JNI.cpp | 2 +- src/app/server/java/ChipFabricProvider-JNI.h | 2 +- src/app/server/java/src/chip/appserver/ChipAppServer.java | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/app/server/java/BUILD.gn b/src/app/server/java/BUILD.gn index 92a26124b18f77..905257607e7178 100644 --- a/src/app/server/java/BUILD.gn +++ b/src/app/server/java/BUILD.gn @@ -26,9 +26,9 @@ static_library("jni") { sources = [ "AndroidAppServerWrapper.cpp", "AndroidAppServerWrapper.h", + "CHIPAppServer-JNI.cpp", "ChipFabricProvider-JNI.cpp", "ChipFabricProvider-JNI.h", - "CHIPAppServer-JNI.cpp", "ChipThreadWork.cpp", "ChipThreadWork.h", ] @@ -60,8 +60,8 @@ android_library("java") { sources = [ "src/chip/appserver/ChipAppServer.java", - "src/chip/appserver/ChipFabricProvider.java", "src/chip/appserver/ChipAppServerException.java", + "src/chip/appserver/ChipFabricProvider.java", "src/chip/appserver/Fabric.java", ] diff --git a/src/app/server/java/ChipFabricProvider-JNI.cpp b/src/app/server/java/ChipFabricProvider-JNI.cpp index e9c668e523cb86..7a558e21a42c67 100644 --- a/src/app/server/java/ChipFabricProvider-JNI.cpp +++ b/src/app/server/java/ChipFabricProvider-JNI.cpp @@ -127,4 +127,4 @@ JNI_METHOD(jint, getFabricCount)(JNIEnv * env, jobject self) JNI_METHOD(jobject, getFabricList)(JNIEnv * env, jobject self) { return ReadFabricList(env, self); -} \ No newline at end of file +} diff --git a/src/app/server/java/ChipFabricProvider-JNI.h b/src/app/server/java/ChipFabricProvider-JNI.h index 49b8b43b4ce70c..09e2b16a7fcb14 100644 --- a/src/app/server/java/ChipFabricProvider-JNI.h +++ b/src/app/server/java/ChipFabricProvider-JNI.h @@ -28,4 +28,4 @@ void AndroidChipFabricProviderJNI_OnUnload(JavaVM * jvm, void * reserved); // a simplified way to get fabric count,see /src/credentials/FabricTable.h#FabricCount int GetFabricCount(); -jobject ReadFabricList(JNIEnv * env, jobject self); \ No newline at end of file +jobject ReadFabricList(JNIEnv * env, jobject self); diff --git a/src/app/server/java/src/chip/appserver/ChipAppServer.java b/src/app/server/java/src/chip/appserver/ChipAppServer.java index b5305448bc1e50..4b414070a12fcf 100644 --- a/src/app/server/java/src/chip/appserver/ChipAppServer.java +++ b/src/app/server/java/src/chip/appserver/ChipAppServer.java @@ -27,8 +27,7 @@ public ChipFabricProvider getFabricProvider() { if (mChipFabricProvider == null) { synchronized (this) { - if (mChipFabricProvider == null) - mChipFabricProvider = new ChipFabricProvider(); + if (mChipFabricProvider == null) mChipFabricProvider = new ChipFabricProvider(); } }