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

Commit b8fd06cd authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Use update RestrictedLockUtils lib APIs 

Test: Looked at permissions UI
Bug: 116798569
Change-Id: I55cb9e3886845e038994c6f175c84f427d0f1e62
parent f6f6e591

src/com/android/packageinstaller/permission/model/AppPermissionGroup.java

+3 −4
Original line number Diff line number Diff line
@@ -260,8 +260,7 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup> 
                            group.getLabel(), group.getDescription(), group.getRequest(),

                            group.getRequestDetail(), group.getBackgroundRequest(),

                            group.getBackgroundRequestDetail(), group.getIconPkg(),

                            group.getIconResId(), UserHandle.of(group.getUserId()),

                            delayChanges);

                            group.getIconResId(), group.getUser(), delayChanges);

                }



                group.getBackgroundPermissions().addPermission(permission);
@@ -509,8 +508,8 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup> 
        return mDescription;

    }



    public int getUserId() {

        return mUserHandle.getIdentifier();

    public UserHandle getUser() {

        return mUserHandle;

    }



    public boolean hasPermission(String permission) {

src/com/android/packageinstaller/permission/model/PermissionApps.java

+0 −4
Original line number Diff line number Diff line
@@ -367,10 +367,6 @@ public class PermissionApps { 
            return mAppPermissionGroup.doesSupportRuntimePermissions();

        }



        public int getUserId() {

            return mAppPermissionGroup.getUserId();

        }



        public String getPackageName() {

            return mPackageName;

        }

src/com/android/packageinstaller/permission/ui/handheld/PermissionPreference.java

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ class PermissionPreference extends MultiTargetSwitchPreference { 
     * @return The admin or {@code null} if there is no admin.

     */

    private EnforcedAdmin getAdmin() {

        return RestrictedLockUtils.getProfileOrDeviceOwner(getContext(), mGroup.getUserId());

        return RestrictedLockUtils.getProfileOrDeviceOwner(getContext(), mGroup.getUser());

    }



    @Override

src/com/android/packageinstaller/permission/ui/wear/AppPermissionsFragmentWear.java

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public final class AppPermissionsFragmentWear extends PreferenceFragmentCompat { 
                // by the device or profile owner. So get that info and pass it to

                // the support details dialog.

                EnforcedAdmin deviceOrProfileOwner = RestrictedLockUtils.getProfileOrDeviceOwner(

                        mActivity, UserHandle.myUserId());

                        mActivity, UserHandle.of(UserHandle.myUserId()));

                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(

                        mActivity, deviceOrProfileOwner);

            }