commit 7c9b2e75d55bb7f39cc23f2bc2e8a8f6e193177e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jul 17 22:52:29 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 17 22:52:29 2023 +0000
tree 4c37881d9629cb0ac9b5718e4bd2c3708f512162
parent c39a3502e08dac31dcf43dbef620040c2b4c67c9
parent 71c30843214fd5b99d4a5365be973f17c89a3585

Merge "Clear calling identity before calling createContextAsUser." into udc-qpr-dev am: 9c6e7c755a am: 71c3084321

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/24086377

Change-Id: I4099da183a6b1abf427a9b6af8b19c08fc035c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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 f33b185..7d3eeb6 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -2707,6 +2707,7 @@
         int packageUid = -1;
         int callingUid = Binder.getCallingUid();
         PackageManager pm;
+        long token = Binder.clearCallingIdentity();
         try{
             pm = mContext.createContextAsUser(
                     UserHandle.getUserHandleForUid(callingUid), 0).getPackageManager();
@@ -2715,6 +2716,8 @@
             Log.i(this, "callingUidMatchesPackageManagerRecords:"
                             + " createContextAsUser hit exception=[%s]", e.toString());
             return false;
+        } finally {
+            Binder.restoreCallingIdentity(token);
         }
         if (pm != null) {
             try {