commit 5851fa014a0c6a245f8da96083674622bfce0d9c
author Tony Mak <tonymak@google.com> Tue Feb 23 19:41:52 2016 +0000
committer Tony Mak <tonymak@google.com> Tue Feb 23 19:54:13 2016 +0000
tree 8003901260cef2964fab7f91f3d26a4da21fe5e3
parent 8e13157767dafcc5adcb5b785c64900aa7ae2248

Should check against calling user instead of current user

The bug is introduced in ag/862293.
We should check calling user instead of current user to support work
profile.

BUG: 27313818
Change-Id: I248ed87a71363d9b624013e938391c4fd79977fa

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 9361160..77d9cfe 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -967,7 +967,8 @@
                                     phoneAccountHandle.getComponentName().getPackageName());
                             // Make sure it doesn't cross the UserHandle boundary
                             enforceUserHandleMatchesCaller(phoneAccountHandle);
-                            enforcePhoneAccountIsRegisteredEnabled(phoneAccountHandle);
+                            enforcePhoneAccountIsRegisteredEnabled(phoneAccountHandle,
+                                    Binder.getCallingUserHandle());
                         }
                         long token = Binder.clearCallingIdentity();
                         try {
@@ -1009,7 +1010,8 @@
 
                         // Make sure it doesn't cross the UserHandle boundary
                         enforceUserHandleMatchesCaller(phoneAccountHandle);
-                        enforcePhoneAccountIsRegisteredEnabled(phoneAccountHandle);
+                        enforcePhoneAccountIsRegisteredEnabled(phoneAccountHandle,
+                                Binder.getCallingUserHandle());
                         long token = Binder.clearCallingIdentity();
 
                         try {
@@ -1296,9 +1298,10 @@
 
     // Enforce that the PhoneAccountHandle being passed in is both registered to the current user
     // and enabled.
-    private void enforcePhoneAccountIsRegisteredEnabled(PhoneAccountHandle phoneAccountHandle) {
-        PhoneAccount phoneAccount = mPhoneAccountRegistrar.getPhoneAccountOfCurrentUser(
-                phoneAccountHandle);
+    private void enforcePhoneAccountIsRegisteredEnabled(PhoneAccountHandle phoneAccountHandle,
+                                                        UserHandle callingUserHandle) {
+        PhoneAccount phoneAccount = mPhoneAccountRegistrar.getPhoneAccount(phoneAccountHandle,
+                callingUserHandle);
         if(phoneAccount == null) {
             EventLog.writeEvent(0x534e4554, "26864502", Binder.getCallingUid(), "R");
             throw new SecurityException("This PhoneAccountHandle is not registered for this user!");