commit 2a98c97ee6e30e30d9378a1be030a05cab71c109
author Sailesh Nepal <sail@google.com> Wed Mar 04 15:43:15 2015 -0800
committer Sailesh Nepal <sail@google.com> Thu Mar 05 12:08:40 2015 -0800
tree b2df0ae43a7c91e346a1c3f711a0927cb187f66f
parent 47da905183b4e2ec50eb16c75852d68b558c7c1e

Allow PSTN phone account for incoming calls from connection manager

Currently the phone account specified for an incoming call must
match belong to the calling app.

This CL relaxes that restricition a little. Now connection managers
can specify PSTN phone accounts when adding a new incoming call.

This is necessary so that incoming calls from the connection manager
are displayed the same way as outgoing calls from the connection
manager.

Bug: 19591608, 19217193
Change-Id: I856ada853865c0ca01a2c3f9baede354f0855ea8

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

diff --git a/src/com/android/server/telecom/TelecomService.java b/src/com/android/server/telecom/TelecomService.java
index 0e0f0a1..e914f32 100644
--- a/src/com/android/server/telecom/TelecomService.java
+++ b/src/com/android/server/telecom/TelecomService.java
@@ -657,11 +657,16 @@
         public void addNewIncomingCall(PhoneAccountHandle phoneAccountHandle, Bundle extras) {
             Log.i(this, "Adding new incoming call with phoneAccountHandle %s", phoneAccountHandle);
             if (phoneAccountHandle != null && phoneAccountHandle.getComponentName() != null) {
-                mAppOpsManager.checkPackage(
-                        Binder.getCallingUid(), phoneAccountHandle.getComponentName().getPackageName());
-
-                // Make sure it doesn't cross the UserHandle boundary
-                enforceUserHandleMatchesCaller(phoneAccountHandle);
+                // TODO(sail): Add unit tests for adding incoming calls from a SIM call manager.
+                if (isCallerSimCallManager() && TelephonyUtil.isPstnComponentName(
+                        phoneAccountHandle.getComponentName())) {
+                    Log.v(this, "Allowing call manager to add incoming call with PSTN handle");
+                } else {
+                    mAppOpsManager.checkPackage(Binder.getCallingUid(),
+                            phoneAccountHandle.getComponentName().getPackageName());
+                    // Make sure it doesn't cross the UserHandle boundary
+                    enforceUserHandleMatchesCaller(phoneAccountHandle);
+                }
 
                 Intent intent = new Intent(TelecomManager.ACTION_INCOMING_CALL);
                 intent.putExtra(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle);
@@ -932,6 +937,19 @@
         }
     }
 
+    private boolean isCallerSimCallManager() {
+        PhoneAccountHandle accountHandle = mPhoneAccountRegistrar.getSimCallManager();
+        if (accountHandle != null) {
+            try {
+                mAppOpsManager.checkPackage(
+                        Binder.getCallingUid(), accountHandle.getComponentName().getPackageName());
+                return true;
+            } catch (SecurityException e) {
+            }
+        }
+        return false;
+    }
+
     private boolean isDefaultDialerCalling() {
         ComponentName defaultDialerComponent = getDefaultPhoneAppInternal();
         if (defaultDialerComponent != null) {