diff options
| -rw-r--r-- | src/com/android/bluetooth/btservice/AdapterService.java | 4 | ||||
| -rwxr-xr-x | src/com/android/bluetooth/btservice/ProfileService.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java index 6004b3dda..2f33522b7 100644 --- a/src/com/android/bluetooth/btservice/AdapterService.java +++ b/src/com/android/bluetooth/btservice/AdapterService.java @@ -429,6 +429,7 @@ public class AdapterService extends Service { mSdpManager = SdpManager.init(this); registerReceiver(mAlarmBroadcastReceiver, new IntentFilter(ACTION_ALARM_WAKEUP)); + setAdapterService(this); @@ -467,9 +468,6 @@ public class AdapterService extends Service { mJniCallbacks.init(mBondStateMachine,mRemoteDevices); - //FIXME: Set static instance here??? - setAdapterService(this); - checkA2dpState(); //Start Gatt service diff --git a/src/com/android/bluetooth/btservice/ProfileService.java b/src/com/android/bluetooth/btservice/ProfileService.java index 0c021620d..c3802fb60 100755 --- a/src/com/android/bluetooth/btservice/ProfileService.java +++ b/src/com/android/bluetooth/btservice/ProfileService.java @@ -113,6 +113,8 @@ public abstract class ProfileService extends Service { public int onStartCommand(Intent intent, int flags, int startId) { if (DBG) log("onStartCommand()"); + if(mAdapterService == null) + mAdapterService = AdapterService.getAdapterService(); if (mStartError || mAdapter == null) { Log.w(mName, "Stopping profile service: device does not have BT"); doStop(intent); |