Merge "b/15452153 Send 0 delta volume requests" into lmp-preview-dev (b6b31f27) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/media/MediaSessionService.java

+23 −12

Original line number	Diff line number	Diff line
		@@ -781,26 +781,37 @@ public class MediaSessionService extends SystemService implements Monitor {

		}
		if (session == null) {
		for (int i = 0; i < steps; i++) {
		try {
		if (delta == 0) {
		mAudioService.adjustSuggestedStreamVolume(delta, suggestedStream, flags,
		getContext().getOpPackageName());
		} else {
		for (int i = 0; i < steps; i++) {
		mAudioService.adjustSuggestedStreamVolume(direction, suggestedStream,
		flags, getContext().getOpPackageName());
		}
		}
		} catch (RemoteException e) {
		Log.e(TAG, "Error adjusting default volume.", e);
		}
		}
		} else {
		if (session.getPlaybackType() == MediaSession.VOLUME_TYPE_LOCAL) {
		for (int i = 0; i < steps; i++) {
		try {
		if (delta == 0) {
		mAudioService.adjustSuggestedStreamVolume(delta,
		session.getAudioStream(), flags,
		getContext().getOpPackageName());
		} else {
		for (int i = 0; i < steps; i++) {
		mAudioService.adjustSuggestedStreamVolume(direction,
		session.getAudioStream(), flags,
		getContext().getOpPackageName());
		}
		}
		} catch (RemoteException e) {
		Log.e(TAG, "Error adjusting volume for stream "
		+ session.getAudioStream(), e);
		}
		}
		} else if (session.getPlaybackType() == MediaSession.VOLUME_TYPE_REMOTE) {
		session.adjustVolumeBy(delta);
		}