Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d9066c3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix profile owners uid logic" into udc-dev am: d8700bfa am: c05ba85a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23376820



Change-Id: Ib75f85496134d0edc7a854ca20d0221e2f31f062
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d7339989 c05ba85a

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

+9 −1
Original line number Diff line number Diff line
@@ -204,7 +204,15 @@ class Owners { 


    @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() {