commit 84135b5bf5fac0bf8e6faab538e2b70483bf3aa6
author Tyler Gunn <tgunn@google.com> Mon May 14 20:24:37 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 14 20:24:37 2018 +0000
tree c63c0a9c6c0ff2d74d02fa27770a1652f5baace9
parent 0530046667acbfa05b5e38fd19573dbb3c956d7f
parent ea0a4af91307cfc327249612715ee4d3d202bb09

Merge "Ensure ConnectionService death triggers disconnect tone."

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

diff --git a/src/com/android/server/telecom/PhoneStateBroadcaster.java b/src/com/android/server/telecom/PhoneStateBroadcaster.java
index a44fc03..d574589 100644
--- a/src/com/android/server/telecom/PhoneStateBroadcaster.java
+++ b/src/com/android/server/telecom/PhoneStateBroadcaster.java
@@ -106,7 +106,9 @@
         mCurrentState = phoneState;
 
         String callHandle = null;
-        if (call.getHandle() != null) {
+        // Only report phone numbers in phone state broadcast for regular mobile calls; do not
+        // include numbers from 3rd party apps.
+        if (!call.isSelfManaged() && call.getHandle() != null) {
             callHandle = call.getHandle().getSchemeSpecificPart();
         }
 

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 478d7e1..aa4c98d 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 {