From def4fd900d21dc14015866cd8d14fcd61b715b69 Mon Sep 17 00:00:00 2001 From: Weilun Du Date: Fri, 18 Jan 2019 08:59:51 -0800 Subject: [PATCH] Fixed Settings crash caused by null bluetooth adpater. Emulator doesn't support bluetooth. BUG: 123026204 Change-Id: I5fddfaff03dfd882688a73542278d8ef1e509ca2 Signed-off-by: Weilun Du --- .../accessibility/AccessibilityHearingAidPreferenceController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java index a94bc6d879..617a9bb735 100644 --- a/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java +++ b/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java @@ -152,7 +152,7 @@ public class AccessibilityHearingAidPreferenceController extends BasePreferenceC if (!mHearingAidProfileSupported) { return null; } - if (!mBluetoothAdapter.isEnabled()) { + if (mBluetoothAdapter == null || !mBluetoothAdapter.isEnabled()) { return null; } final List deviceList = mLocalBluetoothManager.getProfileManager() @@ -166,6 +166,9 @@ public class AccessibilityHearingAidPreferenceController extends BasePreferenceC } private boolean isHearingAidProfileSupported() { + if (mBluetoothAdapter == null || !mBluetoothAdapter.isEnabled()) { + return false; + } final List supportedList = mBluetoothAdapter.getSupportedProfiles(); if (supportedList.contains(BluetoothProfile.HEARING_AID)) { return true; -- 2.11.0