projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace : iotivity -> iotivity-sec
[platform/upstream/iotivity.git]
/
android
/
android_api
/
base
/
src
/
main
/
java
/
org
/
iotivity
/
ca
/
CaBtPairingInterface.java
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
(file)
--- 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;
public class CaBtPairingInterface {
private static Context mContext;
+ private static volatile boolean isBtInitialized = false;
private CaBtPairingInterface(Context context) {
synchronized(CaBtPairingInterface.class) {
mContext = context;
}
private CaBtPairingInterface(Context context) {
synchronized(CaBtPairingInterface.class) {
mContext = context;
}
- registerIntentFilter();
+ if (!isBtInitialized) {
+ registerIntentFilter();
+ isBtInitialized = true;
+ }
}
private static IntentFilter registerIntentFilter() {
}
private static IntentFilter registerIntentFilter() {
@@
-47,7
+51,10
@@
public class CaBtPairingInterface {
}
public static void destroyEdrInterface() {
}
public static void destroyEdrInterface() {
- mContext.unregisterReceiver(mReceiver);
+ if (isBtInitialized) {
+ mContext.unregisterReceiver(mReceiver);
+ isBtInitialized = false;
+ }
}
private native static void oicEdrStateChangedCallback(int state);
}
private native static void oicEdrStateChangedCallback(int state);