diff options
| author | Hemant Gupta <hemantg@codeaurora.org> | 2014-07-18 17:10:33 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2014-11-04 08:26:02 -0700 |
| commit | 004757417790e8ca7d2679e370c4727a6c135c9a (patch) | |
| tree | 6a44abda30479acb94a0439862209e263d550282 /src/com/android/bluetooth/opp/BluetoothOppManager.java | |
| parent | e281f0f38f5bcdc71a6d975543dc76667a17bdf3 (diff) | |
| download | android_packages_apps_Bluetooth-004757417790e8ca7d2679e370c4727a6c135c9a.tar.gz android_packages_apps_Bluetooth-004757417790e8ca7d2679e370c4727a6c135c9a.tar.bz2 android_packages_apps_Bluetooth-004757417790e8ca7d2679e370c4727a6c135c9a.zip | |
OPP: Support OPP1.2 Features over L2CAP.
Support OPP1.2 features. OBEX over L2CAP , SRM and SRMP.
Use javax.btobex lib instead of javax.obex for OBEX OPP,
MAP and PBAP profiles.
CRs-Fixed: 639499
Conflicts:
src/com/android/bluetooth/opp/BluetoothOppTransfer.java
src/com/android/bluetooth/map/BluetoothMapService.java
Conflicts:
Android.mk
src/com/android/bluetooth/map/BluetoothMapAuthenticator.java
src/com/android/bluetooth/map/BluetoothMapService.java
src/com/android/bluetooth/map/BluetoothMnsObexClient.java
Change-Id: I9b4e64dcc4eae44252334547d5478a12f5b9bef5
Diffstat (limited to 'src/com/android/bluetooth/opp/BluetoothOppManager.java')
| -rw-r--r-- | src/com/android/bluetooth/opp/BluetoothOppManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/bluetooth/opp/BluetoothOppManager.java b/src/com/android/bluetooth/opp/BluetoothOppManager.java index 8a4831828..8f1e1deef 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppManager.java +++ b/src/com/android/bluetooth/opp/BluetoothOppManager.java @@ -120,6 +120,8 @@ public class BluetoothOppManager { // The time for which the whitelist entries remain valid. private static final int WHITELIST_DURATION_MS = 15000; + public boolean isA2DPPlaying; + /** * Get singleton instance. */ @@ -151,7 +153,7 @@ public class BluetoothOppManager { // Restore data from preference restoreApplicationData(); - + isA2DPPlaying = false; return true; } |