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

Merge "Disable volume control bar for all remote devices" into sc-dev am: 10ad24809c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15498082

Change-Id: Ie31040e125ad8089391c54a07af545cd9964d140
This commit is contained in:
tim peng
2021-08-11 02:52:41 +00:00
committed by Automerger Merge Worker
parent 6979e0834e 10ad24809c
commit 800027912c
1 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java
View File

@@ -15,7 +15,6 @@
*/ */
package com.android.settingslib.media; package com.android.settingslib.media;
import static android.media.MediaRoute2Info.FEATURE_REMOTE_GROUP_PLAYBACK;
import static android.media.MediaRoute2Info.TYPE_BLUETOOTH_A2DP; import static android.media.MediaRoute2Info.TYPE_BLUETOOTH_A2DP;
import static android.media.MediaRoute2Info.TYPE_BUILTIN_SPEAKER; import static android.media.MediaRoute2Info.TYPE_BUILTIN_SPEAKER;
import static android.media.MediaRoute2Info.TYPE_DOCK; import static android.media.MediaRoute2Info.TYPE_DOCK;
@@ -388,34 +387,7 @@ public class InfoMediaManager extends MediaManager {
@TargetApi(Build.VERSION_CODES.R) @TargetApi(Build.VERSION_CODES.R)
boolean shouldEnableVolumeSeekBar(RoutingSessionInfo sessionInfo) { boolean shouldEnableVolumeSeekBar(RoutingSessionInfo sessionInfo) {
if (sessionInfo == null) { return false;
Log.w(TAG, "shouldEnableVolumeSeekBar() package name is null or empty!");
return false;
}
final List<MediaRoute2Info> mediaRoute2Infos =
mRouterManager.getSelectedRoutes(sessionInfo);
// More than one selected route
if (mediaRoute2Infos.size() > 1) {
if (DEBUG) {
Log.d(TAG, "shouldEnableVolumeSeekBar() package name : "
+ sessionInfo.getClientPackageName()
+ ", mediaRoute2Infos.size() " + mediaRoute2Infos.size());
}
return false;
}
// Route contains group feature
for (MediaRoute2Info mediaRoute2Info : mediaRoute2Infos) {
final List<String> features = mediaRoute2Info.getFeatures();
if (features.contains(FEATURE_REMOTE_GROUP_PLAYBACK)) {
if (DEBUG) {
Log.d(TAG, "shouldEnableVolumeSeekBar() package name : "
+ mediaRoute2Info.getClientPackageName()
+ "contain group playback ");
}
return false;
}
}
return true;
} }
private void refreshDevices() { private void refreshDevices() {