commit ecd22f1974f19c98b8430340b866e537fa657605
author Brad Ebinger <breadley@google.com> Fri Feb 19 22:55:10 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 19 22:55:10 2016 +0000
tree 606d5a8995076a0c51d390f822e0123aba161ae5
parent 386b33497e2ecbcecd6243db6daa3ccade9f2e92
parent 75d30fab5c13fea88e204a9a743b2dd427fd41b3

resolve merge conflicts of f7622446f1 to lmp-mr1-dev
am: 75d30fab5c

* commit '75d30fab5c13fea88e204a9a743b2dd427fd41b3':
  DO NOT MERGE addNewIncomingCall now checks PAH

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 e914f32..77fb1d2 100644
--- a/src/com/android/server/telecom/TelecomService.java
+++ b/src/com/android/server/telecom/TelecomService.java
@@ -43,6 +43,8 @@
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
+import android.util.EventLog;
+
 // TODO: Needed for move to system service: import com.android.internal.R;
 import com.android.internal.telecom.ITelecomService;
 import com.android.internal.util.IndentingPrintWriter;
@@ -664,6 +666,8 @@
                 } else {
                     mAppOpsManager.checkPackage(Binder.getCallingUid(),
                             phoneAccountHandle.getComponentName().getPackageName());
+
+                    enforcePhoneAccountIsRegistered(phoneAccountHandle);
                     // Make sure it doesn't cross the UserHandle boundary
                     enforceUserHandleMatchesCaller(phoneAccountHandle);
                 }
@@ -690,6 +694,7 @@
                 mAppOpsManager.checkPackage(
                         Binder.getCallingUid(), phoneAccountHandle.getComponentName().getPackageName());
 
+                enforcePhoneAccountIsRegistered(phoneAccountHandle);
                 // Make sure it doesn't cross the UserHandle boundary
                 enforceUserHandleMatchesCaller(phoneAccountHandle);
 
@@ -855,6 +860,16 @@
         return false;
     }
 
+    // Enforce that the PhoneAccountHandle being passed in is registered to a valid PhoneAccount. 
+    private void enforcePhoneAccountIsRegistered(PhoneAccountHandle phoneAccountHandle) {
+        PhoneAccount phoneAccount = mPhoneAccountRegistrar.getPhoneAccount(phoneAccountHandle);
+        if(phoneAccount == null) {
+            EventLog.writeEvent(0x534e4554, "26864502", Binder.getCallingUid(), "R");
+            throw new SecurityException("This PhoneAccountHandle is not registered to a valid " +
+                    "PhoneAccount!");
+        }
+    }
+
     private void enforcePhoneAccountModificationForPackage(String packageName) {
         // TODO: Use a new telecomm permission for this instead of reusing modify.