Revert "Bluetooth : Move ACCEPT_ALL_FILES to CMSettings"
This reverts commit 78eb2ebefcecbfaf80d0b2d148020d7a3100fd08.
diff --git a/Android.mk b/Android.mk
index e6807fc..59fbf6e 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 org.cyanogenmod.platform.internal
+LOCAL_STATIC_JAVA_LIBRARIES += com.android.emailcommon
LOCAL_REQUIRED_MODULES := bluetooth.default
LOCAL_MULTILIB := 32
diff --git a/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java b/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
index 18e646b..e9f2bbb 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java
@@ -67,8 +67,6 @@
import com.android.bluetooth.BluetoothObexTransport;
-import cyanogenmod.providers.CMSettings;
-
/**
* This class runs as an OBEX server
*/
@@ -258,8 +256,8 @@
}
boolean isWhitelisted = BluetoothOppManager.getInstance(mContext).
isWhitelisted(destination);
- boolean isAcceptAllFilesEnabled = CMSettings.System.getInt(mContext.getContentResolver(),
- CMSettings.System.BLUETOOTH_ACCEPT_ALL_FILES, 0) == 1;
+ boolean isAcceptAllFilesEnabled = Settings.System.getInt(mContext.getContentResolver(),
+ Settings.System.BLUETOOTH_ACCEPT_ALL_FILES, 0) == 1;
try {
boolean pre_reject = false;