commit c9039002df5a8b6a9149faf257c231efb538c750
author Satish Kodishala <skodisha@codeaurora.org> Wed Dec 11 14:47:29 2019 +0530
committer Satish Kumar Kodishala <skodisha@codeaurora.org> Thu Dec 12 12:47:11 2019 +0000
tree 9b6c010d7ea80b59edf0a827a432c96ce8a06317
parent d6939cda23884eefb7127935e8fdf5df86712371

Get AdapterService while setting priority

SetPriority is done as part of bond state changed
event while HeadsetProfile cleanup during BT turn off.
Get AdapterService object directly and add a null check
before dereferencing.

CRs-Fixed: 2584397
Change-Id: Ibdb0f4603452bf34abbecff17cf7bfbe8b2e8136

src/com/android/bluetooth/hfp/HeadsetService.java

diff --git a/src/com/android/bluetooth/hfp/HeadsetService.java b/src/com/android/bluetooth/hfp/HeadsetService.java
index fce6d43..7bb15f0 100644
--- a/src/com/android/bluetooth/hfp/HeadsetService.java
+++ b/src/com/android/bluetooth/hfp/HeadsetService.java
@@ -1175,8 +1175,12 @@
         enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");
         Log.i(TAG, "setPriority: device=" + device + ", priority=" + priority + ", "
                 + Utils.getUidPidString());
-        mAdapterService.getDatabase()
+        AdapterService adapterService = AdapterService.getAdapterService();
+        if (adapterService != null)
+            adapterService.getDatabase()
                 .setProfilePriority(device, BluetoothProfile.HEADSET, priority);
+        else
+            Log.i(TAG, "adapter service is null");
         return true;
     }