commit 67133f910cfb9d8f379ac77a91567f399ad28693
author Treehugger Robot <android-build-prod@system.gserviceaccount.com> Thu Dec 12 20:13:24 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 12 20:13:24 2019 +0000
tree c5ad50cb46de7f2a6bd998de20d528243d5bd983
parent 7e098b619e28bcab6a84f32a9fac156ea7ed9f32
parent c9039002df5a8b6a9149faf257c231efb538c750

Merge "Get AdapterService while setting priority" into q-keystone-qcom-dev

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 b255c40..d9cadd9 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;
     }