From 4d47387480d5c0a2f883fb7fbbd930cbf341a749 Mon Sep 17 00:00:00 2001 From: Nitin Arora Date: Tue, 11 Aug 2015 12:17:07 -0700 Subject: Prevent profile service notification from getting masked This patch involves early assignment of the static self reference of AdapterService class, to be used by ProfileServices. This change also helps late assignment of the AdapterService reference in the ProfileService object. This change is needed for an SSR scenario where the service restart happens even before the ManagerService restarts the service Change-Id: I826d362d7c866971eab7e7f442102e56dd685908 --- src/com/android/bluetooth/btservice/AdapterService.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/com/android/bluetooth/btservice/AdapterService.java') 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 -- cgit v1.2.3