commit 7233fedade70b4017c487495a35b761ab21542dd
author Tyler Gunn <tgunn@google.com> Tue May 08 04:01:35 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 08 04:01:35 2018 +0000
tree 381b19f3261bbd316a3d6c5fbc7f674d88a6dbdb
parent 592daffc25a9d29d137ba1c529513de53e505541
parent e27a5312eee9e11b1c4d51659097aa8e4f0e9dd8

Merge "Change permission checks for endCall method." into pi-dev

src/com/android/server/telecom/TelecomServiceImpl.java

diff --git a/src/com/android/server/telecom/TelecomServiceImpl.java b/src/com/android/server/telecom/TelecomServiceImpl.java
index 2c00941..ea55e63 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -771,7 +771,9 @@
             try {
                 Log.startSession("TSI.eC");
                 synchronized (mLock) {
-                    enforceModifyPermission();
+                    if (!enforceAnswerCallPermission(callingPackage, Binder.getCallingUid())) {
+                        throw new SecurityException("requires ANSWER_PHONE_CALLS permission");
+                    }
 
                     long token = Binder.clearCallingIdentity();
                     try {