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

Commit e3e94286 authored by Jorge Ruesga's avatar Jorge Ruesga Committed by Gerrit Code Review
Browse files

pm: remove stale permissions 



Remove all previously declared permissions of an app, that currently aren't defined in
is actual version. Only remove a permission when:

1.- The app is not the system app
2.- The permission is a normal permission (ignore dynamic and builtin ones, and hence
       permissions derived from a permission-tree)
3.- The permission isn't currently declared by the app
4.- Do not apply if the PackageManager is running in "onlyCore" mode

Change-Id: Ie42a13bd94f0689570426ed06244b31d1213c1aa
JIRA: CML-125
Signed-off-by: default avatarJorge Ruesga <jorge@ruesga.com>
parent c4204b51

services/core/java/com/android/server/pm/PackageManagerService.java

+6 −0
Original line number Diff line number Diff line
@@ -1888,6 +1888,12 @@ public class PackageManagerService extends IPackageManager.Stub { 
                            ? (UPDATE_PERMISSIONS_REPLACE_PKG|UPDATE_PERMISSIONS_REPLACE_ALL)

                            : 0));













            // Remove any stale app permissions (declared permission that now are undeclared













            // by the same app, removed from its Manifest in newer versions)













            if (!onlyCore) {













                mSettings. removeStalePermissions();













            }



























            // If this is the first boot, and it is a normal boot, then















            // we need to initialize the default preferred apps.















            if (!mRestoredSettings && !onlyCore) {

































services/core/java/com/android/server/pm/Settings.java



+51
−0




























Original line number
Diff line number
Diff line








@@ -3367,6 +3367,57 @@ final class Settings {













        return false;















    }





























    void  removeStalePermissions() {













        /*













         * Remove any permission that is not currently declared by any package













         */













        List<BasePermission> permissionsToRemove = new ArrayList<>();













        for (BasePermission basePerm : mPermissions.values()) {













            // Ignore permissions declared by the system













            if (basePerm.sourcePackage.equals("android") ||













                    basePerm.sourcePackage.equals("cyanogenmod.platform")) {













                continue;













            }













            // Ignore permissions other than NORMAL (ignore DYNAMIC and BUILTIN), like the













            // ones based on permission-trees













            if (basePerm.type != BasePermission.TYPE_NORMAL) {













                continue;













            }



























            if (!mPackages.containsKey(basePerm.sourcePackage)) {













                // Package doesn't exist













                permissionsToRemove.add(basePerm);













                continue;













            }













            PackageSetting pkgSettings = mPackages.get(basePerm.sourcePackage);













            if (pkgSettings.pkg == null || pkgSettings.pkg.permissions == null) {













                // Package doesn't declare permissions













                permissionsToRemove.add(basePerm);













                continue;













            }













            boolean found = false;













            for (PackageParser.Permission perm : pkgSettings.pkg.permissions) {













                if (perm.info.name != null && basePerm.name.equals(perm.info.name)) {













                    // The original package still declares the permission













                    found = true;













                    break;













                }













            }













            if (!found) {













                // The original package doesn't currently declare the permission













                permissionsToRemove.add(basePerm);













            }













        }













        // And now remove all stale permissions













        for (BasePermission basePerm : permissionsToRemove) {













            String msg = "Removed stale permission: " + basePerm.name + " originally " +













                    "assigned to " + basePerm.sourcePackage + "\n";













            mReadMessages.append(msg);













            PackageManagerService.reportSettingsProblem(Log.WARN, msg);













            mPermissions.remove(basePerm.name);













        }













    }





























    private List<UserInfo> getAllUsers() {















        long id = Binder.clearCallingIdentity();















        try {