commit a62ca2b53cdbd7d306574ae54ec329b4fd71bfe7
author Tyler Gunn <tgunn@google.com> Thu Jan 10 19:12:37 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 10 19:12:37 2019 +0000
tree 5b8ab1b2d544151ae8bf2aef6e310bca24921e43
parent cf67d9169bffdcc00fe7244d1d085bbc5b8f1bd4
parent c74e1ec61d2a390e24c11592936bebf77711fd21

Merge "Call Screening and Caller ID changes"

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 f57a0c6..8f38984 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -472,7 +472,10 @@
                                 && extras.getBoolean(PhoneAccount.EXTRA_SKIP_CALL_FILTERING)) {
                             enforceRegisterSkipCallFiltering();
                         }
-                        enforceUserHandleMatchesCaller(account.getAccountHandle());
+                        final int callingUid = Binder.getCallingUid();
+                        if (callingUid != Process.SHELL_UID) {
+                            enforceUserHandleMatchesCaller(account.getAccountHandle());
+                        }
                         final long token = Binder.clearCallingIdentity();
                         try {
                             mPhoneAccountRegistrar.registerPhoneAccount(account);