commit 4f5241999cda431be04553173e4474b3225b4415
author Zach Jang <zachjang@google.com> Thu Feb 25 14:47:53 2016 -0800
committer The Android Automerger <android-build@android.com> Fri Feb 26 14:39:09 2016 -0800
tree d5b6159e66b70803e295c1d343e93d35b9dd7b9e
parent a06c9a4aef69ae27b951523cf72bf72412bf48fa

Created as manual cherry-pick for http://ag/866007 to lmp-mr1-release

Change-Id: Ic7519c3f888c548446e5058a628c2d10bad1db6a

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..0f3f676 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;
@@ -660,6 +662,7 @@
                 mAppOpsManager.checkPackage(
                         Binder.getCallingUid(), phoneAccountHandle.getComponentName().getPackageName());
 
+                enforcePhoneAccountIsRegistered(phoneAccountHandle);
                 // Make sure it doesn't cross the UserHandle boundary
                 enforceUserHandleMatchesCaller(phoneAccountHandle);
 
@@ -685,6 +688,7 @@
                 mAppOpsManager.checkPackage(
                         Binder.getCallingUid(), phoneAccountHandle.getComponentName().getPackageName());
 
+                enforcePhoneAccountIsRegistered(phoneAccountHandle);
                 // Make sure it doesn't cross the UserHandle boundary
                 enforceUserHandleMatchesCaller(phoneAccountHandle);
 
@@ -850,6 +854,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.