commit 4268ef3966561235dfc53a5b4b04163e41d20f58
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Mar 08 21:19:12 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Mar 08 21:19:12 2018 +0000
tree 296e6c4d753ae1c16d6dfbba1626e442287d82fd
parent 2ff848a9648babca218ea2fa4ee610b213c70e13
parent 5480989b5a945aeca6fb10212c7c709003cbfeaf

[automerger] Merge commit '7d518b39bc046617cc31a8cd42a7b5db4d7311e4' into am-7ab8b227-c8ac-4100-8ef0-da42db9d62a0 am: aebacebb68 am: 5de9270a3a am: 1b205c36c2 am: 5480989b5a

Change-Id: Ieaec4dfdf939fe971b731bc448e737d14a12d387

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 92da36f..cccffbd 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -66,6 +66,7 @@
 import android.telephony.VisualVoicemailSmsFilterSettings;
 import android.text.TextUtils;
 import android.util.ArraySet;
+import android.util.EventLog;
 import android.util.Log;
 import android.util.Pair;
 import android.util.Slog;
@@ -1157,7 +1158,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));
     }