commit ccd654e9d4c38da0d652c442e7a2ca3f447e9abe
author Jean-Michel Trivi <jmtrivi@google.com> Wed Sep 03 17:48:47 2014 -0700
committer Jean-Michel Trivi <jmtrivi@google.com> Fri Sep 05 09:50:54 2014 -0700
tree 1232cc6007a64c8fcb6f563ca1162ab74bde6c76
parent 526b642290eb81674d7772f85ced967c19714b68

Permission check for entering MODE_IN_CALL

Make the ability to change the audio mode conditional to having
 the MODIFY_PHONE_STATE permission.
Make AudioService's internal implementation of the mode setting
 (the setModeInt() method) private, it is only meant to be used
 by AudioService.
Refer to the permission names through Manifest.permission, not
 by their string value.

Bug 14964198

Change-Id: I49870207566e53d5c8764646cece06d8272f93ed

media/java/android/media/AudioService.java

diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index d15085b..f09a51f 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -1774,6 +1774,15 @@
             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;
         }
@@ -1795,7 +1804,7 @@
     // 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) {
@@ -3055,7 +3064,7 @@
     }
 
     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;
         }