diff options
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/RoutingSessionInfo.java | 27 | ||||
| -rw-r--r-- | media/tests/MediaRouter/src/com/android/mediaroutertest/RoutingSessionInfoTest.java | 22 |
2 files changed, 1 insertions, 48 deletions
diff --git a/media/java/android/media/RoutingSessionInfo.java b/media/java/android/media/RoutingSessionInfo.java index 9899e4ec388d..83a4dd5a682a 100644 --- a/media/java/android/media/RoutingSessionInfo.java +++ b/media/java/android/media/RoutingSessionInfo.java @@ -22,7 +22,6 @@ import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; -import android.content.res.Resources; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; @@ -57,8 +56,6 @@ public final class RoutingSessionInfo implements Parcelable { } }; - private static final String TAG = "RoutingSessionInfo"; - private static final String KEY_GROUP_ROUTE = "androidx.mediarouter.media.KEY_GROUP_ROUTE"; private static final String KEY_VOLUME_HANDLING = "volumeHandling"; @@ -142,15 +139,7 @@ public final class RoutingSessionInfo implements Parcelable { mVolume = builder.mVolume; mIsSystemSession = builder.mIsSystemSession; - - boolean volumeAdjustmentForRemoteGroupSessions = Resources.getSystem().getBoolean( - com.android.internal.R.bool.config_volumeAdjustmentForRemoteGroupSessions); - mVolumeHandling = - defineVolumeHandling( - mIsSystemSession, - builder.mVolumeHandling, - mSelectedRoutes, - volumeAdjustmentForRemoteGroupSessions); + mVolumeHandling = builder.mVolumeHandling; mControlHints = updateVolumeHandlingInHints(builder.mControlHints, mVolumeHandling); mTransferReason = builder.mTransferReason; @@ -207,20 +196,6 @@ public final class RoutingSessionInfo implements Parcelable { return controlHints; } - @MediaRoute2Info.PlaybackVolume - private static int defineVolumeHandling( - boolean isSystemSession, - @MediaRoute2Info.PlaybackVolume int volumeHandling, - List<String> selectedRoutes, - boolean volumeAdjustmentForRemoteGroupSessions) { - if (!isSystemSession - && !volumeAdjustmentForRemoteGroupSessions - && selectedRoutes.size() > 1) { - return MediaRoute2Info.PLAYBACK_VOLUME_FIXED; - } - return volumeHandling; - } - @NonNull private static String ensureString(@Nullable String str) { return str != null ? str : ""; diff --git a/media/tests/MediaRouter/src/com/android/mediaroutertest/RoutingSessionInfoTest.java b/media/tests/MediaRouter/src/com/android/mediaroutertest/RoutingSessionInfoTest.java index 3955ff068d94..5f5058d79545 100644 --- a/media/tests/MediaRouter/src/com/android/mediaroutertest/RoutingSessionInfoTest.java +++ b/media/tests/MediaRouter/src/com/android/mediaroutertest/RoutingSessionInfoTest.java @@ -18,8 +18,6 @@ package com.android.mediaroutertest; import static com.google.common.truth.Truth.assertThat; -import android.content.res.Resources; -import android.media.MediaRoute2Info; import android.media.RoutingSessionInfo; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -95,24 +93,4 @@ public class RoutingSessionInfoTest { assertThat(sessionInfoWithProviderId2.getTransferableRoutes()) .isEqualTo(sessionInfoWithProviderId.getTransferableRoutes()); } - - @Test - public void testGetVolumeHandlingGroupSession() { - RoutingSessionInfo sessionInfo = new RoutingSessionInfo.Builder( - TEST_ID, TEST_CLIENT_PACKAGE_NAME) - .setName(TEST_NAME) - .addSelectedRoute(TEST_ROUTE_ID_0) - .addSelectedRoute(TEST_ROUTE_ID_2) - .setVolumeHandling(MediaRoute2Info.PLAYBACK_VOLUME_VARIABLE) - .build(); - - boolean volumeAdjustmentForRemoteGroupSessions = Resources.getSystem().getBoolean( - com.android.internal.R.bool.config_volumeAdjustmentForRemoteGroupSessions); - - int expectedResult = volumeAdjustmentForRemoteGroupSessions - ? MediaRoute2Info.PLAYBACK_VOLUME_VARIABLE : - MediaRoute2Info.PLAYBACK_VOLUME_FIXED; - - assertThat(sessionInfo.getVolumeHandling()).isEqualTo(expectedResult); - } } |