Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[LeBroadcast] Fix the NullPointerException for launching dialog" into tm-qpr-dev

Browse Source
This commit is contained in:
SongFerng Wang
2022-07-29 06:18:29 +00:00
committed by Android (Google) Code Review
parent f52b49886c f77dbb4c4a
commit e2d4dcf0e5
3 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothLeBroadcast.java
View File

@@ -303,6 +303,18 @@ public class LocalBluetoothLeBroadcast implements LocalBluetoothProfile {
}
public BluetoothLeBroadcastMetadata getLatestBluetoothLeBroadcastMetadata() {
if (mService == null) {
Log.d(TAG, "The BluetoothLeBroadcast is null");
return null;
}
if (mBluetoothLeBroadcastMetadata == null) {
final List<BluetoothLeBroadcastMetadata> metadataList =
mService.getAllBroadcastMetadata();
mBluetoothLeBroadcastMetadata = metadataList.stream()
.filter(i -> i.getBroadcastId() == mBroadcastId)
.findFirst()
.orElse(null);
}
return mBluetoothLeBroadcastMetadata;
}
@@ -372,7 +384,12 @@ public class LocalBluetoothLeBroadcast implements LocalBluetoothProfile {
}
public LocalBluetoothLeBroadcastMetadata getLocalBluetoothLeBroadcastMetaData() {
return new LocalBluetoothLeBroadcastMetadata(mBluetoothLeBroadcastMetadata);
final BluetoothLeBroadcastMetadata metadata = getLatestBluetoothLeBroadcastMetadata();
if (metadata == null) {
Log.d(TAG, "The BluetoothLeBroadcastMetadata is null.");
return null;
}
return new LocalBluetoothLeBroadcastMetadata(metadata);
}
public boolean isProfileReady() {

10
packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java
View File

@@ -101,6 +101,7 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements
private int mListMaxHeight;
private WallpaperColors mWallpaperColors;
private Executor mExecutor;
private boolean mShouldLaunchLeBroadcastDialog;
MediaOutputBaseAdapter mAdapter;
@@ -399,7 +400,9 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements
}
public void handleLeBroadcastStarted() {
startLeBroadcastDialog();
// Waiting for the onBroadcastMetadataChanged. The UI launchs the broadcast dialog when
// the metadata is ready.
mShouldLaunchLeBroadcastDialog = true;
}
public void handleLeBroadcastStartFailed() {
@@ -409,10 +412,15 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements
}
public void handleLeBroadcastMetadataChanged() {
if (mShouldLaunchLeBroadcastDialog) {
startLeBroadcastDialog();
mShouldLaunchLeBroadcastDialog = false;
}
refresh();
}
public void handleLeBroadcastStopped() {
mShouldLaunchLeBroadcastDialog = false;
refresh();
}

5
packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java
View File

@@ -62,6 +62,7 @@ import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.Utils;
import com.android.settingslib.bluetooth.BluetoothUtils;
import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast;
import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastMetadata;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.media.InfoMediaManager;
import com.android.settingslib.media.LocalMediaManager;
@@ -834,7 +835,9 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback,
Log.d(TAG, "getBroadcastMetadata: LE Audio Broadcast is null");
return "";
}
return broadcast.getLocalBluetoothLeBroadcastMetaData().convertToQrCodeString();
final LocalBluetoothLeBroadcastMetadata metadata =
broadcast.getLocalBluetoothLeBroadcastMetaData();
return metadata != null ? metadata.convertToQrCodeString() : "";
}
boolean isActiveRemoteDevice(@NonNull MediaDevice device) {