am 4dd21c8e: Volume changes in MediaRouteChooserDialog (9b5cdf4f) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/MediaRouteChooserDialogFragment.java

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -70,7 +70,6 @@ public class MediaRouteChooserDialogFragment extends DialogFragment {
	};		};

	MediaRouter mRouter;		MediaRouter mRouter;
	AudioManager mAudio;
	private int mRouteTypes;		private int mRouteTypes;

	private LayoutInflater mInflater;		private LayoutInflater mInflater;
	@@ -98,7 +97,6 @@ public class MediaRouteChooserDialogFragment extends DialogFragment {
	public void onAttach(Activity activity) {		public void onAttach(Activity activity) {
	super.onAttach(activity);		super.onAttach(activity);
	mRouter = (MediaRouter) activity.getSystemService(Context.MEDIA_ROUTER_SERVICE);		mRouter = (MediaRouter) activity.getSystemService(Context.MEDIA_ROUTER_SERVICE);
	mAudio = (AudioManager) activity.getSystemService(Context.AUDIO_SERVICE);
	}		}

	@Override		@Override
	@@ -150,7 +148,7 @@ public class MediaRouteChooserDialogFragment extends DialogFragment {

	final RouteInfo selectedRoute = mRouter.getSelectedRoute(mRouteTypes);		final RouteInfo selectedRoute = mRouter.getSelectedRoute(mRouteTypes);
	if (selectedRoute.getVolumeHandling() == RouteInfo.PLAYBACK_VOLUME_VARIABLE) {		if (selectedRoute.getVolumeHandling() == RouteInfo.PLAYBACK_VOLUME_VARIABLE) {
	final int maxVolume = mAudio.getStreamMaxVolume(AudioManager.STREAM_MUSIC);		final int maxVolume = selectedRoute.getVolumeMax();
	newValue = Math.max(0, Math.min(newValue, maxVolume));		newValue = Math.max(0, Math.min(newValue, maxVolume));
	selectedRoute.requestSetVolume(newValue);		selectedRoute.requestSetVolume(newValue);
	}		}