release-request-c8b8af6b-4899-402a-9ff7-72255ba5300b-for-git_oc-mr1-release-42... (0bc53fbb) · Commits · e / os / android_packages_apps_PackageInstaller

src/com/android/packageinstaller/permission/model/AppPermissions.java

+11 −4

Original line number	Diff line number	Diff line
		@@ -136,7 +136,7 @@ public final class AppPermissions {
		}

		private void addPermissionGroupIfNeeded(String permission) {
		if (hasGroupForPermission(permission)) {
		if (getGroupForPermission(permission) != null) {
		return;
		}

		@@ -149,12 +149,19 @@ public final class AppPermissions {
		mGroups.add(group);
		}

		private boolean hasGroupForPermission(String permission) {
		/**
		* Find the group a permission belongs to.
		*
		* @param permission The name of the permission
		*
		* @return The group the permission belongs to
		*/
		public AppPermissionGroup getGroupForPermission(String permission) {
		for (AppPermissionGroup group : mGroups) {
		if (group.hasPermission(permission)) {
		return true;
		return group;
		}
		}
		return false;
		return null;
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,8 @@ public final class RuntimePermissionPresenterServiceImpl extends RuntimePermissi
		PackageManager.GET_PERMISSIONS);
		final AppPermissions appPermissions = new AppPermissions(this, packageInfo, null, false,
		null);
		final AppPermissionGroup appPermissionGroup = appPermissions.getPermissionGroup(

		final AppPermissionGroup appPermissionGroup = appPermissions.getGroupForPermission(
		permissionName);

		if (appPermissionGroup != null) {