commit d8700bfabf59b5ccdb1edf1e7acd67aeaf4719e8
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue May 23 21:27:02 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 23 21:27:02 2023 +0000
tree 28fb4b569827b1e1256898977f2ae625c2ddcc54
parent 0a75c7fa8771c3523fce82f3d907b8f6bc14028a
parent 8d54cb871e3c577c593644d4708966e65cea993e

Merge "Fix profile owners uid logic" into udc-dev

services/devicepolicy/java/com/android/server/devicepolicy/Owners.java

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java b/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java
index 0c1c406..bb275e45 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/Owners.java
@@ -204,7 +204,15 @@
 
     @GuardedBy("mData")
     Set<Integer> getProfileOwnerUidsLocked() {
-        return mData.mProfileOwners.keySet();
+        Set<Integer> uids = new ArraySet<>();
+        for (int i = 0; i < mData.mProfileOwners.size(); i++) {
+            int userId = mData.mProfileOwners.keyAt(i);
+            OwnerInfo info = mData.mProfileOwners.valueAt(i);
+            uids.add(mPackageManagerInternal.getPackageUid(info.packageName,
+                    PackageManager.MATCH_ALL | PackageManager.MATCH_KNOWN_PACKAGES,
+                    userId));
+        }
+        return uids;
     }
 
     String getDeviceOwnerPackageName() {