When only one device is selected in dynamic group, the device should be disabled
-Check if device id is in selected group rather than comparing client package name -Add test cases Bug: 154916764 Test: make -j50 RunSettingsRoboTests Change-Id: I7364a9e3d807bbfc6b26b8212ab2da67ea329582
This commit is contained in:
@@ -174,6 +174,15 @@ public class MediaDeviceUpdateWorker extends SliceBackgroundWorker
|
||||
return mLocalMediaManager.getSelectedMediaDevice();
|
||||
}
|
||||
|
||||
boolean isSelectedMediaDevice(MediaDevice device) {
|
||||
for (MediaDevice selectedMediaDevice : getSelectedMediaDevice()) {
|
||||
if (TextUtils.equals(selectedMediaDevice.getId(), device.getId())) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void adjustSessionVolume(String sessionId, int volume) {
|
||||
mLocalMediaManager.adjustSessionVolume(sessionId, volume);
|
||||
}
|
||||
|
||||
@@ -238,7 +238,7 @@ public class MediaOutputGroupSlice implements CustomSliceable {
|
||||
+ ") is unavailable");
|
||||
return;
|
||||
}
|
||||
if (TextUtils.equals(device.getClientPackageName(), getWorker().getPackageName())) {
|
||||
if (getWorker().isSelectedMediaDevice(device)) {
|
||||
getWorker().removeDeviceFromPlayMedia(device);
|
||||
} else {
|
||||
getWorker().addDeviceToPlayMedia(device);
|
||||
|
||||
Reference in New Issue
Block a user