diff options
| author | Sravan Kumar V <sravankumar@codeaurora.org> | 2016-07-19 17:28:46 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-15 06:09:10 -0700 |
| commit | 96a55efb0edac3c2af523f938b338dd16d4f8ac4 (patch) | |
| tree | 8428b6f808f92e5db8f27dae0489e0266e6d29ee /src/com/android/bluetooth/opp/BluetoothOppTransfer.java | |
| parent | ee8eae967a8db87eb6b505c2a28bfa89fda656f4 (diff) | |
| download | android_packages_apps_Bluetooth-96a55efb0edac3c2af523f938b338dd16d4f8ac4.tar.gz android_packages_apps_Bluetooth-96a55efb0edac3c2af523f938b338dd16d4f8ac4.tar.bz2 android_packages_apps_Bluetooth-96a55efb0edac3c2af523f938b338dd16d4f8ac4.zip | |
Bluetooth: Disable NON-AOSP BT DATA Features
Disable NON-AOSP bluetooth data related features from
resource configuration values
If disable_non_aosp_bt_features is set as true in config.xml
following NON-AOSP features would be disabled
OPP-1.2
MAP-EMAIL
PBAP-1.2
PBAP-SIM
disable_non_aosp_bt_features is set to false by default. It can be
configured as per need.
Change-Id: I4c5924bd7c94407342c6da83869eaa8da905605d
CRs-Fixed: 1064006
Diffstat (limited to 'src/com/android/bluetooth/opp/BluetoothOppTransfer.java')
| -rw-r--r-- | src/com/android/bluetooth/opp/BluetoothOppTransfer.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/bluetooth/opp/BluetoothOppTransfer.java b/src/com/android/bluetooth/opp/BluetoothOppTransfer.java index 4dcbb09c3..d74cbd67b 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppTransfer.java +++ b/src/com/android/bluetooth/opp/BluetoothOppTransfer.java @@ -32,6 +32,7 @@ package com.android.bluetooth.opp; +import com.android.bluetooth.R; import javax.obex.ObexTransport; import com.android.bluetooth.BluetoothObexTransport; @@ -565,7 +566,10 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch mConnectThread.start(); } else { OolConnManager.setSdpInitiatedAddress(mBatch.mDestination); - if (!mBatch.mDestination.sdpSearch(BluetoothUuid.ObexObjectPush)) { + boolean isDisabledNonAosp = mContext.getResources().getBoolean + (R.bool.disable_non_aosp_bt_features); + if (D) Log.d(TAG, "isDisabledNonAosp :" + isDisabledNonAosp); + if (isDisabledNonAosp || !mBatch.mDestination.sdpSearch(BluetoothUuid.ObexObjectPush)) { /* SDP failed, start rfcomm connect directly */ mConnectThread = new SocketConnectThread(mBatch.mDestination, false, false); /* update bd address as sdp could not be started */ |