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

diff --git a/android/android_api/base/src/main/java/org/iotivity/ca/CaEdrInterface.java b/android/android_api/base/src/main/java/org/iotivity/ca/CaEdrInterface.java
index aaf8bc6..067dbf3 100644
--- a/android/android_api/base/src/main/java/org/iotivity/ca/CaEdrInterface.java
+++ b/android/android_api/base/src/main/java/org/iotivity/ca/CaEdrInterface.java
@@ -30,12 +30,16 @@ import android.util.Log;
 
 public class CaEdrInterface {
     private static Context mContext;
+    private static volatile boolean isEdrInitialized = false;
 
     private CaEdrInterface(Context context) {
         synchronized(CaEdrInterface.class) {
             mContext = context;
         }
-        registerIntentFilter();
+        if (!isEdrInitialized) {
+            registerIntentFilter();
+            isEdrInitialized = true;
+        }
     }
 
     private static IntentFilter registerIntentFilter() {
@@ -48,7 +52,10 @@ public class CaEdrInterface {
     }
 
     public static void destroyEdrInterface() {
-        mContext.unregisterReceiver(mReceiver);
+        if (isEdrInitialized) {
+            mContext.unregisterReceiver(mReceiver);
+            isEdrInitialized = false;
+        }
     }
 
     // Network Monitor