Merge "grantPermissionsLPw: get rid of a level of curly braces" into jb-mr2-dev (5b7d1481) · Commits · e / os / android_frameworks_base

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

+76 −74

Original line number	Diff line number	Diff line
		@@ -5120,7 +5120,13 @@ public class PackageManagerService extends IPackageManager.Stub {
		Log.i(TAG, "Package " + pkg.packageName + " checking " + name + ": " + bp);
		}
		}
		if (bp != null && bp.packageSetting != null) {

		if (bp == null \|\| bp.packageSetting == null) {
		Slog.w(TAG, "Unknown permission " + name
		+ " in package " + pkg.packageName);
		continue;
		}

		final String perm = bp.name;
		boolean allowed;
		boolean allowedSig = false;
		@@ -5200,10 +5206,6 @@ public class PackageManagerService extends IPackageManager.Stub {
		+ ")");
		}
		}
		} else {
		Slog.w(TAG, "Unknown permission " + name
		+ " in package " + pkg.packageName);
		}
		}

		if ((changedPermission \|\| replace) && !ps.permissionsFixed &&