X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=android%2Fandroid_api%2Fbase%2Fsrc%2Fmain%2Fjava%2Forg%2Fiotivity%2Fca%2FCaBtPairingInterface.java;h=5811afd9bcb5f3ca56062ee9c09cd6964be4dda2;hb=7f00f942c39b7bc27c7eeecf213a239c3fe4173c;hp=e06d574161e7aa57be44bffd3b273e681e6bdaf4;hpb=edcfc3d2329da7b914771c0dcff5f42c9b74fd93;p=platform%2Fupstream%2Fiotivity.git

diff --git a/android/android_api/base/src/main/java/org/iotivity/ca/CaBtPairingInterface.java b/android/android_api/base/src/main/java/org/iotivity/ca/CaBtPairingInterface.java
index e06d574..5811afd 100644
--- a/android/android_api/base/src/main/java/org/iotivity/ca/CaBtPairingInterface.java
+++ b/android/android_api/base/src/main/java/org/iotivity/ca/CaBtPairingInterface.java
@@ -29,12 +29,16 @@ import android.content.IntentFilter;
 
 public class CaBtPairingInterface {
     private static Context mContext;
+    private static volatile boolean isBtInitialized = false;
 
     private CaBtPairingInterface(Context context) {
         synchronized(CaBtPairingInterface.class) {
             mContext = context;
         }
-        registerIntentFilter();
+        if (!isBtInitialized) {
+            registerIntentFilter();
+            isBtInitialized = true;
+        }
     }
 
     private static IntentFilter registerIntentFilter() {
@@ -47,7 +51,10 @@ public class CaBtPairingInterface {
     }
 
     public static void destroyEdrInterface() {
-        mContext.unregisterReceiver(mReceiver);
+        if (isBtInitialized) {
+            mContext.unregisterReceiver(mReceiver);
+            isBtInitialized = false;
+        }
     }
 
     private native static void oicEdrStateChangedCallback(int state);