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

Commit bc57510e authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Improved variable naming" 

am: 4ef9d410

* commit '4ef9d410':
  Improved variable naming
parents 38400b46 4ef9d410

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

+7 −7
Original line number Original line Diff line number Diff line
@@ -8135,9 +8135,9 @@ public class PackageManagerService extends IPackageManager.Stub { 
                }

                }

            }

            }

            if ((p.info.protectionLevel&PermissionInfo.PROTECTION_FLAG_APPOP) != 0) {

            if ((p.info.protectionLevel&PermissionInfo.PROTECTION_FLAG_APPOP) != 0) {

                ArraySet<String> appOpPerms = mAppOpPermissionPackages.get(p.info.name);

                ArraySet<String> appOpPkgs = mAppOpPermissionPackages.get(p.info.name);

                if (appOpPerms != null) {

                if (appOpPkgs != null) {

                    appOpPerms.remove(pkg.packageName);

                    appOpPkgs.remove(pkg.packageName);

                }

                }

            }

            }

        }

        }
@@ -8151,10 +8151,10 @@ public class PackageManagerService extends IPackageManager.Stub { 
            String perm = pkg.requestedPermissions.get(i);

            String perm = pkg.requestedPermissions.get(i);

            BasePermission bp = mSettings.mPermissions.get(perm);

            BasePermission bp = mSettings.mPermissions.get(perm);

            if (bp != null && (bp.protectionLevel&PermissionInfo.PROTECTION_FLAG_APPOP) != 0) {

            if (bp != null && (bp.protectionLevel&PermissionInfo.PROTECTION_FLAG_APPOP) != 0) {

                ArraySet<String> appOpPerms = mAppOpPermissionPackages.get(perm);

                ArraySet<String> appOpPkgs = mAppOpPermissionPackages.get(perm);

                if (appOpPerms != null) {

                if (appOpPkgs != null) {

                    appOpPerms.remove(pkg.packageName);

                    appOpPkgs.remove(pkg.packageName);

                    if (appOpPerms.isEmpty()) {

                    if (appOpPkgs.isEmpty()) {

                        mAppOpPermissionPackages.remove(perm);

                        mAppOpPermissionPackages.remove(perm);

                    }

                    }

                }

                }