commit def4fd900d21dc14015866cd8d14fcd61b715b69
author Weilun Du <wdu@google.com> Fri Jan 18 08:59:51 2019 -0800
committer Weilun Du <wdu@google.com> Tue Jan 22 00:12:20 2019 +0000
tree 8d72785a68343b05cc319151bd87b5c7c9129790
parent c2d1050665659c78c95d148db2b0735298052693

Fixed Settings crash caused by null bluetooth adpater.

Emulator doesn't support bluetooth.

BUG: 123026204
Change-Id: I5fddfaff03dfd882688a73542278d8ef1e509ca2
Signed-off-by: Weilun Du <wdu@google.com>

src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java

diff --git a/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java
index a94bc6d..617a9bb 100644
--- a/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java
+++ b/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java
@@ -152,7 +152,7 @@
         if (!mHearingAidProfileSupported) {
             return null;
         }
-        if (!mBluetoothAdapter.isEnabled()) {
+        if (mBluetoothAdapter == null || !mBluetoothAdapter.isEnabled()) {
             return null;
         }
         final List<BluetoothDevice> deviceList = mLocalBluetoothManager.getProfileManager()
@@ -166,6 +166,9 @@
     }
 
     private boolean isHearingAidProfileSupported() {
+        if (mBluetoothAdapter == null || !mBluetoothAdapter.isEnabled()) {
+            return false;
+        }
         final List<Integer> supportedList = mBluetoothAdapter.getSupportedProfiles();
         if (supportedList.contains(BluetoothProfile.HEARING_AID)) {
             return true;