commit 78eb2ebefcecbfaf80d0b2d148020d7a3100fd08
author Danesh M <daneshm90@gmail.com> Thu Nov 12 11:45:09 2015 -0800
committer Danesh M <daneshm90@gmail.com> Thu Nov 12 11:45:09 2015 -0800
tree 5a5545aaa96be3c73375a738d4b18bf0f1100239
parent d6242df5af9e0ee15ac04a679342fdd2809e4291

Bluetooth : Move ACCEPT_ALL_FILES to CMSettings

Change-Id: Ia07553e08e6f228c6082b80d0bb2732dcd3465dd

Android.mk

diff --git a/Android.mk b/Android.mk
index 59fbf6e..e6807fc 100755
--- a/Android.mk
+++ b/Android.mk
@@ -23,7 +23,7 @@
 LOCAL_JNI_SHARED_LIBRARIES := libbluetooth_jni
 LOCAL_JAVA_LIBRARIES := javax.obex telephony-common libprotobuf-java-micro
 LOCAL_STATIC_JAVA_LIBRARIES := com.android.vcard  bluetooth.mapsapi sap-api-java-static
-LOCAL_STATIC_JAVA_LIBRARIES += com.android.emailcommon
+LOCAL_STATIC_JAVA_LIBRARIES += com.android.emailcommon org.cyanogenmod.platform.internal
 
 LOCAL_REQUIRED_MODULES := bluetooth.default
 LOCAL_MULTILIB := 32

src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java

diff --git a/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java b/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
index bd799f9..9c363db 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
@@ -67,6 +67,8 @@
 
 import com.android.bluetooth.BluetoothObexTransport;
 
+import cyanogenmod.providers.CMSettings;
+
 /**
  * This class runs as an OBEX server
  */
@@ -254,8 +256,8 @@
         }
         boolean isWhitelisted = BluetoothOppManager.getInstance(mContext).
                 isWhitelisted(destination);
-        boolean isAcceptAllFilesEnabled = Settings.System.getInt(mContext.getContentResolver(),
-                Settings.System.BLUETOOTH_ACCEPT_ALL_FILES, 0) == 1;
+        boolean isAcceptAllFilesEnabled = CMSettings.System.getInt(mContext.getContentResolver(),
+                CMSettings.System.BLUETOOTH_ACCEPT_ALL_FILES, 0) == 1;
 
         try {
             boolean pre_reject = false;