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

Commit 0bc53fbb authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-c8b8af6b-4899-402a-9ff7-72255ba5300b-for-git_oc-mr1-release-42...

release-request-c8b8af6b-4899-402a-9ff7-72255ba5300b-for-git_oc-mr1-release-4253898 snap-temp-L09600000090287887

Change-Id: I0dab9ed9ce386d45a8ee146eb804f469c5530899
parents dbd90314 d97f9e45
Loading
Loading
Loading
Loading
+11 −4
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ public final class AppPermissions {
    }

    private void addPermissionGroupIfNeeded(String permission) {
        if (hasGroupForPermission(permission)) {
        if (getGroupForPermission(permission) != null) {
            return;
        }

@@ -149,12 +149,19 @@ public final class AppPermissions {
        mGroups.add(group);
    }

    private boolean hasGroupForPermission(String permission) {
    /**
     * Find the group a permission belongs to.
     *
     * @param permission The name of the permission
     *
     * @return The group the permission belongs to
     */
    public AppPermissionGroup getGroupForPermission(String permission) {
        for (AppPermissionGroup group : mGroups) {
            if (group.hasPermission(permission)) {
                return true;
                return group;
            }
        }
        return false;
        return null;
    }
}
+2 −1
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ public final class RuntimePermissionPresenterServiceImpl extends RuntimePermissi
                    PackageManager.GET_PERMISSIONS);
            final AppPermissions appPermissions = new AppPermissions(this, packageInfo, null, false,
                    null);
            final AppPermissionGroup appPermissionGroup = appPermissions.getPermissionGroup(

            final AppPermissionGroup appPermissionGroup = appPermissions.getGroupForPermission(
                    permissionName);

            if (appPermissionGroup != null) {