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

2021-03-22 17:44:35 +00:00
parent b7c6619e19 7f7c292af2
commit 310cb1b8b6
1 changed files with 8 additions and 3 deletions
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -22903,9 +22903,14 @@ public class PackageManagerService extends IPackageManager.Stub

    @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