PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2nd attempt handle BT is not supported on emulator

Browse Source 
am: 59287d40d1

Change-Id: I843fc58484df106af09cae87dcb886ea49aa53ea
This commit is contained in:
ryanywlin
2018-06-08 11:10:56 -07:00
committed by android-build-merger
parent 1fe94d4fd7 59287d40d1
commit de3d9a0a73
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/sound/AudioSwitchPreferenceController.java
View File

@@ -170,12 +170,20 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont
@Override @Override
public void onStart() { public void onStart() {
if (mLocalBluetoothManager == null) {
Log.e(TAG, "Bluetooth is not supported on this device");
return;
}
mLocalBluetoothManager.setForegroundActivity(mContext); mLocalBluetoothManager.setForegroundActivity(mContext);
register(); register();
} }
@Override @Override
public void onStop() { public void onStop() {
if (mLocalBluetoothManager == null) {
Log.e(TAG, "Bluetooth is not supported on this device");
return;
}
mLocalBluetoothManager.setForegroundActivity(null); mLocalBluetoothManager.setForegroundActivity(null);
unregister(); unregister();
} }

2
tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
View File

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