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

Merge "Fix the NullPointerException" into udc-qpr-dev

Browse Source
This commit is contained in:
SongFerng Wang
2023-08-25 10:00:42 +00:00
committed by Android (Google) Code Review
parent 6bd2ecf6fb 280dfac8af
commit acd7bbefd1
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/media/MediaOutputIndicatorWorker.java
View File

@@ -167,12 +167,20 @@ public class MediaOutputIndicatorWorker extends SliceBackgroundWorker implements
/** Check if this device supports LE Audio Broadcast feature */ /** Check if this device supports LE Audio Broadcast feature */
public boolean isBroadcastSupported() { public boolean isBroadcastSupported() {
if (mLocalBluetoothManager == null) {
Log.e(TAG, "isBroadcastSupported: Bluetooth is not supported on this device");
return false;
}
LocalBluetoothLeBroadcast broadcast = LocalBluetoothLeBroadcast broadcast =
mLocalBluetoothManager.getProfileManager().getLeAudioBroadcastProfile(); mLocalBluetoothManager.getProfileManager().getLeAudioBroadcastProfile();
return broadcast != null ? true : false; return broadcast != null ? true : false;
} }
public boolean isDeviceBroadcasting() { public boolean isDeviceBroadcasting() {
if (mLocalBluetoothManager == null) {
Log.e(TAG, "isDeviceBroadcasting: Bluetooth is not supported on this device");
return false;
}
LocalBluetoothLeBroadcast broadcast = LocalBluetoothLeBroadcast broadcast =
mLocalBluetoothManager.getProfileManager().getLeAudioBroadcastProfile(); mLocalBluetoothManager.getProfileManager().getLeAudioBroadcastProfile();
if (broadcast == null) { if (broadcast == null) {

14
tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java
View File

@@ -313,4 +313,18 @@ public class MediaOutputIndicatorWorkerTest {
assertThat(mMediaOutputIndicatorWorker.isBroadcastSupported()).isTrue(); assertThat(mMediaOutputIndicatorWorker.isBroadcastSupported()).isTrue();
} }
@Test
public void isBroadcastSupported_noLocalMediaManager_returnFalse() {
mMediaOutputIndicatorWorker.mLocalMediaManager = null;
assertThat(mMediaOutputIndicatorWorker.isBroadcastSupported()).isFalse();
}
@Test
public void isDeviceBroadcasting_noLocalMediaManager_returnFalse() {
mMediaOutputIndicatorWorker.mLocalMediaManager = null;
assertThat(mMediaOutputIndicatorWorker.isDeviceBroadcasting()).isFalse();
}
} }