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

Commit 10d3f372 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Persist permission state for updated apps synchronously." am: 6d1cecb3 

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



Change-Id: I376428cc56d956a93a489d2a69adb99b900a170e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6455bee2 6d1cecb3

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+16 −5
Original line number Diff line number Diff line
@@ -2626,6 +2626,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
        final int[] userIds = filterUserId == UserHandle.USER_ALL ? getAllUserIds()

                : new int[] { filterUserId };



        boolean installPermissionsChanged = false;

        boolean runtimePermissionsRevoked = false;

        int[] updatedUserIds = EMPTY_INT_ARRAY;
@@ -2739,7 +2740,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { 


                UidPermissionState origState = uidState;



                boolean changedInstallPermission = false;

                boolean installPermissionsChangedForUser = false;



                if (replace) {

                    userState.setInstallPermissionsFixed(ps.name, false);
@@ -2904,7 +2905,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
                                                    && origState.isPermissionGranted(permName))))) {

                        // Grant an install permission.

                        if (uidState.grantPermission(bp)) {

                            changedInstallPermission = true;

                            installPermissionsChangedForUser = true;

                        }

                    } else if (bp.isRuntime()) {

                        boolean hardRestricted = bp.isHardRestricted();
@@ -3034,12 +3035,12 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
                            }

                        }

                        if (uidState.removePermissionState(bp.getName())) {

                            changedInstallPermission = true;

                            installPermissionsChangedForUser = true;

                        }

                    }

                }



                if ((changedInstallPermission || replace)

                if ((installPermissionsChangedForUser || replace)

                        && !userState.areInstallPermissionsFixed(ps.name)

                        && !ps.isSystem() || ps.getPkgState().isUpdatedSystemApp()) {

                    // This is the first that we have heard about this package, so the
@@ -3048,6 +3049,12 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
                    userState.setInstallPermissionsFixed(ps.name, true);

                }



                if (installPermissionsChangedForUser) {

                    installPermissionsChanged = true;

                    if (replace) {

                        updatedUserIds = ArrayUtils.appendInt(updatedUserIds, userId);

                    }

                }

                updatedUserIds = revokePermissionsNoLongerImplicitLocked(uidState,

                        pkg.getPackageName(), uidImplicitPermissions, uidTargetSdkVersion, userId,

                        updatedUserIds);
@@ -3064,8 +3071,12 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
        // Persist the runtime permissions state for users with changes. If permissions

        // were revoked because no app in the shared user declares them we have to

        // write synchronously to avoid losing runtime permissions state.

        // Also write synchronously if we changed any install permission for an updated app, because

        // the install permission state is likely already fixed before update, and if we lose the

        // changes here the app won't be reconsidered for newly-added install permissions.

        if (callback != null) {

            callback.onPermissionUpdated(updatedUserIds, runtimePermissionsRevoked);

            callback.onPermissionUpdated(updatedUserIds,

                    (replace && installPermissionsChanged) || runtimePermissionsRevoked);

        }



        for (int userId : updatedUserIds) {