2nd attempt handle BT is not supported on emulator

Error handle before using LocalBluetoothManager in the onStart
and onStop

Bug: 80491267
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j42
Change-Id: I47f7d3b7cddc2fbbafb8fb5cf0fb6adb2d0d2d55
This commit is contained in:
ryanywlin
2018-06-08 14:36:34 +08:00
parent ee96c3a259
commit 59287d40d1
2 changed files with 10 additions and 0 deletions

View File

@@ -170,12 +170,20 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont
@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();
}

View File

@@ -186,6 +186,8 @@ public class AudioOutputSwitchPreferenceControllerTest {
AudioSwitchPreferenceController controller = new AudioSwitchPreferenceControllerTestable(
mContext, TEST_KEY);
controller.onStart();
controller.onStop();
assertThat(mLocalBluetoothManager).isNull();
}