commit 310cb1b8b6bf6d126e7623951f46cfab7dda6eca
author Guliz Tuncay <gulizseray@google.com> Mon Mar 22 17:44:35 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 22 17:44:35 2021 +0000
tree d98bb0071e9414731b3dfa137a78a2b3c959d423
parent b7c6619e19afd9f07c2c82e1008e73b5e85133b8
parent 7f7c292af2b9f4195b121229b32286004d5b0d05

Merge "Call role manager with cleared calling identity in getWellbeingPackageName()." into sc-dev

services/core/java/com/android/server/pm/PackageManagerService.java

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 43eeb2a5..b27c0bd 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -22903,9 +22903,14 @@
 
     @Override
     public String getWellbeingPackageName() {
-        return CollectionUtils.firstOrNull(
-                mContext.getSystemService(RoleManager.class).getRoleHolders(
-                        RoleManager.ROLE_SYSTEM_WELLBEING));
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return CollectionUtils.firstOrNull(
+                    mContext.getSystemService(RoleManager.class).getRoleHolders(
+                            RoleManager.ROLE_SYSTEM_WELLBEING));
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     @Override