commit 87681f232cb7a97c96d5e0ea5421e9fb696a22c7
author Tyler Gunn <tgunn@google.com> Wed Apr 19 20:43:52 2017 +0000
committer Tyler Gunn <tgunn@google.com> Wed Apr 19 22:16:00 2017 +0000
tree 8ef3a2b8f3d6a7fd536ece8000ce94473a5f6a2e
parent 3048c360f74ab61ba0bb45d403e5f2fb6be6e562

Clear caller identify before registering and unregistering phone acct.

Fixes issue with intent being received as expected in legacy use case.

Bug: 37430159
Merged-In: Ibac58ccd0caaad325f4c44b7fe6feda5bb878388
Change-Id: Ibac58ccd0caaad325f4c44b7fe6feda5bb878388
(cherry picked from commit 42064bc739f5efdb8563f09f763c0d4d9b33df57)

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 f741a52..b1ba744 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -397,7 +397,12 @@
                             enforceRegisterMultiUser();
                         }
                         enforceUserHandleMatchesCaller(account.getAccountHandle());
-                        mPhoneAccountRegistrar.registerPhoneAccount(account);
+                        final long token = Binder.clearCallingIdentity();
+                        try {
+                            mPhoneAccountRegistrar.registerPhoneAccount(account);
+                        } finally {
+                            Binder.restoreCallingIdentity(token);
+                        }
                     } catch (Exception e) {
                         Log.e(this, e, "registerPhoneAccount %s", account);
                         throw e;
@@ -416,7 +421,12 @@
                     enforcePhoneAccountModificationForPackage(
                             accountHandle.getComponentName().getPackageName());
                     enforceUserHandleMatchesCaller(accountHandle);
-                    mPhoneAccountRegistrar.unregisterPhoneAccount(accountHandle);
+                    final long token = Binder.clearCallingIdentity();
+                    try {
+                        mPhoneAccountRegistrar.unregisterPhoneAccount(accountHandle);
+                    } finally {
+                        Binder.restoreCallingIdentity(token);
+                    }
                 } catch (Exception e) {
                     Log.e(this, e, "unregisterPhoneAccount %s", accountHandle);
                     throw e;