Merge "Revert "AudioService: permission for volume adjustment to lowest... (09883497) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioManagerInternal.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -29,13 +29,13 @@ import com.android.server.LocalServices;
		public abstract class AudioManagerInternal {

		public abstract void adjustSuggestedStreamVolumeForUid(int streamType, int direction,
		int flags, String callingPackage, int uid, int pid);
		int flags, String callingPackage, int uid);

		public abstract void adjustStreamVolumeForUid(int streamType, int direction, int flags,
		String callingPackage, int uid, int pid);
		String callingPackage, int uid);

		public abstract void setStreamVolumeForUid(int streamType, int direction, int flags,
		String callingPackage, int uid, int pid);
		String callingPackage, int uid);

		public abstract void setRingerModeDelegate(RingerModeDelegate delegate);

services/core/java/com/android/server/audio/AudioService.java

+40 −138

File changed.

Preview size limit exceeded, changes collapsed.

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

+4 −7

Original line number	Diff line number	Diff line
		@@ -328,7 +328,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR
		public void run() {
		try {
		mAudioManagerInternal.setStreamVolumeForUid(stream, volumeValue, flags,
		opPackageName, uid, pid);
		opPackageName, uid);
		} catch (IllegalArgumentException \| SecurityException e) {
		Log.e(TAG, "Cannot set volume: stream=" + stream + ", value=" + volumeValue
		+ ", flags=" + flags, e);
		@@ -501,15 +501,12 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR
		// Must use opPackageName for adjusting volumes with UID.
		final String opPackageName;
		final int uid;
		final int pid;
		if (asSystemService) {
		opPackageName = mContext.getOpPackageName();
		uid = Process.SYSTEM_UID;
		pid = Process.myPid();
		} else {
		opPackageName = callingOpPackageName;
		uid = callingUid;
		pid = callingPid;
		}
		mHandler.post(new Runnable() {
		@Override
		@@ -518,15 +515,15 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR
		if (useSuggested) {
		if (AudioSystem.isStreamActive(stream, 0)) {
		mAudioManagerInternal.adjustSuggestedStreamVolumeForUid(stream,
		direction, flags, opPackageName, uid, pid);
		direction, flags, opPackageName, uid);
		} else {
		mAudioManagerInternal.adjustSuggestedStreamVolumeForUid(
		AudioManager.USE_DEFAULT_STREAM_TYPE, direction,
		flags \| previousFlagPlaySound, opPackageName, uid, pid);
		flags \| previousFlagPlaySound, opPackageName, uid);
		}
		} else {
		mAudioManagerInternal.adjustStreamVolumeForUid(stream, direction, flags,
		opPackageName, uid, pid);
		opPackageName, uid);
		}
		} catch (IllegalArgumentException \| SecurityException e) {
		Log.e(TAG, "Cannot adjust volume: direction=" + direction + ", stream="

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -2107,19 +2107,16 @@ public class MediaSessionService extends SystemService implements Monitor {
		public void run() {
		final String callingOpPackageName;
		final int callingUid;
		final int callingPid;
		if (asSystemService) {
		callingOpPackageName = mContext.getOpPackageName();
		callingUid = Process.myUid();
		callingPid = Process.myPid();
		} else {
		callingOpPackageName = opPackageName;
		callingUid = uid;
		callingPid = pid;
		}
		try {
		mAudioManagerInternal.adjustSuggestedStreamVolumeForUid(suggestedStream,
		direction, flags, callingOpPackageName, callingUid, callingPid);
		direction, flags, callingOpPackageName, callingUid);
		} catch (SecurityException \| IllegalArgumentException e) {
		Log.e(TAG, "Cannot adjust volume: direction=" + direction
		+ ", suggestedStream=" + suggestedStream + ", flags=" + flags