diff options
author | Jaikumar Ganesh <jaikumar@google.com> | 2010-03-24 10:36:06 -0700 |
---|---|---|
committer | Jaikumar Ganesh <jaikumar@google.com> | 2010-03-24 10:43:06 -0700 |
commit | 0bd5f7b5c36a60687ffe895368fd8df6df38acab (patch) | |
tree | 68ef30e92e48a4b9fcd2e7e495804ee0b0a274a9 /src/com/android/bluetooth/opp/BluetoothOppManager.java | |
parent | 20b5a93b6e18cd441065edfdf676ad612affc507 (diff) | |
download | android_packages_apps_Bluetooth-0bd5f7b5c36a60687ffe895368fd8df6df38acab.tar.gz android_packages_apps_Bluetooth-0bd5f7b5c36a60687ffe895368fd8df6df38acab.tar.bz2 android_packages_apps_Bluetooth-0bd5f7b5c36a60687ffe895368fd8df6df38acab.zip |
Fix pbap and opp running bluetooth in phone process problems.
1. Use the right context instead of application context.
2. Make PbapActivity run in the same process as PbapService as they
share state.
Change-Id: Ib50c63c271dd8b30108f22734c47ee8645cd4839
Diffstat (limited to 'src/com/android/bluetooth/opp/BluetoothOppManager.java')
-rw-r--r-- | src/com/android/bluetooth/opp/BluetoothOppManager.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/bluetooth/opp/BluetoothOppManager.java b/src/com/android/bluetooth/opp/BluetoothOppManager.java index 2dd0acb8e..73411d926 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppManager.java +++ b/src/com/android/bluetooth/opp/BluetoothOppManager.java @@ -127,8 +127,7 @@ public class BluetoothOppManager { return true; mInitialized = true; - // This will be around as long as this process is - mContext = context.getApplicationContext(); + mContext = context; mAdapter = BluetoothAdapter.getDefaultAdapter(); if (mAdapter == null) { |