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

Merge "AudioService: evaluate permissions for min stream index" into rvc-dev am: 527765e44b

Browse Source 
Change-Id: I275f82cc522e648c378230642dcd4569caadd811
This commit is contained in:
TreeHugger Robot
2020-05-28 16:27:15 +00:00
committed by Automerger Merge Worker
parent 322f3962e8 527765e44b
commit ea1f7e0f8f
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -109,6 +109,7 @@ import android.os.IBinder;
import android.os.Looper; import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.Process;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.SystemClock; import android.os.SystemClock;
@@ -3186,10 +3187,17 @@ public class AudioService extends IAudioService.Stub
return (mStreamStates[streamType].getMaxIndex() + 5) / 10; return (mStreamStates[streamType].getMaxIndex() + 5) / 10;
} }
/** @see AudioManager#getStreamMinVolumeInt(int) */ /** @see AudioManager#getStreamMinVolumeInt(int)
* Part of service interface, check permissions here */
public int getStreamMinVolume(int streamType) { public int getStreamMinVolume(int streamType) {
ensureValidStreamType(streamType); ensureValidStreamType(streamType);
return (mStreamStates[streamType].getMinIndex() + 5) / 10; final boolean isPrivileged =
Binder.getCallingUid() == Process.SYSTEM_UID
|| (mContext.checkCallingPermission(Manifest.permission.MODIFY_AUDIO_SETTINGS)
== PackageManager.PERMISSION_GRANTED)
|| (mContext.checkCallingPermission(Manifest.permission.MODIFY_AUDIO_ROUTING)
== PackageManager.PERMISSION_GRANTED);
return (mStreamStates[streamType].getMinIndex(isPrivileged) + 5) / 10;
} }
/** Get last audible volume before stream was muted. */ /** Get last audible volume before stream was muted. */
@@ -5796,10 +5804,22 @@ public class AudioService extends IAudioService.Stub
return mIndexMax; return mIndexMax;
} }
/**
* @return the lowest index regardless of permissions
*/
public int getMinIndex() { public int getMinIndex() {
return mIndexMin; return mIndexMin;
} }
/**
* @param isPrivileged true if the caller is privileged and not subject to minimum
* volume index thresholds
* @return the lowest index that this caller can set or adjust to
*/
public int getMinIndex(boolean isPrivileged) {
return isPrivileged ? mIndexMin : mIndexMinNoPerm;
}
/** /**
* Copies all device/index pairs from the given VolumeStreamState after initializing * Copies all device/index pairs from the given VolumeStreamState after initializing
* them with the volume for DEVICE_OUT_DEFAULT. No-op if the source VolumeStreamState * them with the volume for DEVICE_OUT_DEFAULT. No-op if the source VolumeStreamState