From 4fab7fbeb01026e5dc81f9d0dc445042e91c8f80 Mon Sep 17 00:00:00 2001 From: Yury Zhauniarovich Date: Wed, 25 Nov 2015 17:53:20 +0300 Subject: [PATCH] Improved variable naming Variable name "appOpPerms" is substituted to "appOpPkgs", which is better suited. Change-Id: I038b93fdf5e539551c4aab12d9918c9937602e2d Signed-off-by: Yury Zhauniarovich --- .../java/com/android/server/pm/PackageManagerService.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 58e1b33ff35d..151f14da69ea 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -8138,9 +8138,9 @@ public class PackageManagerService extends IPackageManager.Stub { } } if ((p.info.protectionLevel&PermissionInfo.PROTECTION_FLAG_APPOP) != 0) { - ArraySet appOpPerms = mAppOpPermissionPackages.get(p.info.name); - if (appOpPerms != null) { - appOpPerms.remove(pkg.packageName); + ArraySet appOpPkgs = mAppOpPermissionPackages.get(p.info.name); + if (appOpPkgs != null) { + appOpPkgs.remove(pkg.packageName); } } } @@ -8154,10 +8154,10 @@ public class PackageManagerService extends IPackageManager.Stub { String perm = pkg.requestedPermissions.get(i); BasePermission bp = mSettings.mPermissions.get(perm); if (bp != null && (bp.protectionLevel&PermissionInfo.PROTECTION_FLAG_APPOP) != 0) { - ArraySet appOpPerms = mAppOpPermissionPackages.get(perm); - if (appOpPerms != null) { - appOpPerms.remove(pkg.packageName); - if (appOpPerms.isEmpty()) { + ArraySet appOpPkgs = mAppOpPermissionPackages.get(perm); + if (appOpPkgs != null) { + appOpPkgs.remove(pkg.packageName); + if (appOpPkgs.isEmpty()) { mAppOpPermissionPackages.remove(perm); } } -- 2.11.0