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

am 565f0114: am 4bb9033a: am 0bd1a9d7: Merge "Permission check for entering MODE_IN_CALL" into lmp-dev

Browse Source 
* commit '565f01147b56bd6730a0fce8291894b4747ab9f7':
  Permission check for entering MODE_IN_CALL
This commit is contained in:
Jean-Michel Trivi
2014-09-05 18:26:57 +00:00
committed by Android Git Automerger
parent cb1919278e 10463fdb34
commit f0384ee674
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
media/java/android/media/AudioService.java
View File

@@ -1777,6 +1777,15 @@ public class AudioService extends IAudioService.Stub {
return;
}
if ( (mode == AudioSystem.MODE_IN_CALL) &&
(mContext.checkCallingOrSelfPermission(
android.Manifest.permission.MODIFY_PHONE_STATE)
!= PackageManager.PERMISSION_GRANTED)) {
Log.w(TAG, "MODIFY_PHONE_STATE Permission Denial: setMode(MODE_IN_CALL) from pid="
+ Binder.getCallingPid() + ", uid=" + Binder.getCallingUid());
return;
}
if (mode < AudioSystem.MODE_CURRENT || mode >= AudioSystem.NUM_MODES) {
return;
}
@@ -1798,7 +1807,7 @@ public class AudioService extends IAudioService.Stub {
// must be called synchronized on mSetModeDeathHandlers
// setModeInt() returns a valid PID if the audio mode was successfully set to
// any mode other than NORMAL.
int setModeInt(int mode, IBinder cb, int pid) {
private int setModeInt(int mode, IBinder cb, int pid) {
if (DEBUG_MODE) { Log.v(TAG, "setModeInt(mode=" + mode + ", pid=" + pid + ")"); }
int newModeOwnerPid = 0;
if (cb == null) {
@@ -3058,7 +3067,7 @@ public class AudioService extends IAudioService.Stub {
}
boolean checkAudioSettingsPermission(String method) {
if (mContext.checkCallingOrSelfPermission("android.permission.MODIFY_AUDIO_SETTINGS")
if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.MODIFY_AUDIO_SETTINGS)
== PackageManager.PERMISSION_GRANTED) {
return true;
}