am 711f8a17: Merge "Revert "Show location permission group, even when fixed."" into mnc-dev (954f5f2e) · Commits · e / os / android_packages_apps_PackageInstaller

src/com/android/packageinstaller/permission/utils/Utils.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -79,8 +79,7 @@ public class Utils {
		public static boolean shouldShowPermission(AppPermissionGroup group) {
		// We currently will not show permissions fixed by the system.
		// which is what the system does for system components.
		if (group.isSystemFixed()
		&& !Manifest.permission_group.LOCATION.equals(group.getName())) {
		if (group.isSystemFixed()) {
		return false;
		}

		@@ -103,8 +102,7 @@ public class Utils {
		public static boolean shouldShowPermission(PermissionApp app) {
		// We currently will not show permissions fixed by the system
		// which is what the system does for system components.
		if (app.isSystemFixed()
		&& !Manifest.permission_group.LOCATION.equals(app.getPermissionGroup().getName())) {
		if (app.isSystemFixed()) {
		return false;
		}