commit acea1da0c39a97a8cc4c810462df55c0d7975fd8
author Android Build Role Account android-build-prod <android-build-team-robot@google.com> Fri Dec 13 11:11:41 2019 +0000
committer Android Build Role Account android-build-prod <android-build-team-robot@google.com> Fri Dec 13 11:11:41 2019 +0000
tree c5ad50cb46de7f2a6bd998de20d528243d5bd983
parent 5c3d64f77abd69c20095ea40de63fbc44163d32d
parent 67133f910cfb9d8f379ac77a91567f399ad28693

Snap for 6069351 from 67133f910cfb9d8f379ac77a91567f399ad28693 to q-keystone-qcom-release

Change-Id: I2fd56c8dbac3b76187ccece58646b390e54518da

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;
     }