commit 29eec443e06abe949b522f114d2c0879baedac22
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 08 18:32:47 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 08 18:32:47 2018 +0000
tree b0382aca9f1c174f1cfbd6b61710edb70bf2567c
parent 59287d40d1f4668de1beadb684d34e8509edded3
parent 78f0f781fabe22f8dc8bdc61abc79aee41291524

Merge "Fix typo" into pi-dev

src/com/android/settings/sound/AudioSwitchPreferenceController.java

diff --git a/src/com/android/settings/sound/AudioSwitchPreferenceController.java b/src/com/android/settings/sound/AudioSwitchPreferenceController.java
index 6723660..11caf45 100644
--- a/src/com/android/settings/sound/AudioSwitchPreferenceController.java
+++ b/src/com/android/settings/sound/AudioSwitchPreferenceController.java
@@ -170,12 +170,20 @@
 
     @Override
     public void onStart() {
+        if (mLocalBluetoothManager == null) {
+            Log.e(TAG, "Bluetooth is not supported on this device");
+            return;
+        }
         mLocalBluetoothManager.setForegroundActivity(mContext);
         register();
     }
 
     @Override
     public void onStop() {
+        if (mLocalBluetoothManager == null) {
+            Log.e(TAG, "Bluetooth is not supported on this device");
+            return;
+        }
         mLocalBluetoothManager.setForegroundActivity(null);
         unregister();
     }

tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java

diff --git a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
index 1140aee..bd11a15 100644
--- a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
@@ -186,6 +186,8 @@
 
         AudioSwitchPreferenceController controller = new AudioSwitchPreferenceControllerTestable(
                 mContext, TEST_KEY);
+        controller.onStart();
+        controller.onStop();
 
         assertThat(mLocalBluetoothManager).isNull();
     }