commit c33f27f314fa0820e5d9ba7b82f1d74217269b90
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Feb 17 00:18:22 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Feb 17 00:18:22 2018 +0000
tree 0bd479fedbf8d84dffe3afe81ebb8251176ef777
parent a31075b8c80afb79e1408932f04ce48d63554a97
parent 6707357c6e198287046e76c1d6fc5edf1fcb3fee

Merge "Enhanced permission checks for TelephonyManager#endCall() API."

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index f03ad35..3fcd6ee 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -77,6 +77,7 @@
 import android.telephony.ims.stub.ImsRegistrationImplBase;
 import android.text.TextUtils;
 import android.util.ArraySet;
+import android.util.EventLog;
 import android.util.Log;
 import android.util.Pair;
 import android.util.Slog;
@@ -1185,7 +1186,12 @@
      * @return true is a call was ended
      */
     public boolean endCallForSubscriber(int subId) {
-        enforceCallPermission();
+        if (mApp.checkCallingOrSelfPermission(permission.MODIFY_PHONE_STATE)
+                != PackageManager.PERMISSION_GRANTED) {
+            Log.i(LOG_TAG, "endCall: called without modify phone state.");
+            EventLog.writeEvent(0x534e4554, "67862398", -1, "");
+            throw new SecurityException("MODIFY_PHONE_STATE permission required.");
+        }
         return (Boolean) sendRequest(CMD_END_CALL, null, new Integer(subId));
     }