Merge "Pass a String to RuntimePermissionUsageInfo for the group name." (6c33cc0c) · Commits · e / os / android_packages_apps_PackageInstaller

src/com/android/packageinstaller/permission/service/PermissionControllerServiceImpl.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -441,7 +441,7 @@ public final class PermissionControllerServiceImpl extends PermissionControllerS

		@Override public @NonNull List<RuntimePermissionUsageInfo> onGetPermissionUsages(
		boolean countSystem, long numMillis) {
		ArrayMap<CharSequence, Integer> groupUsers = new ArrayMap<>();
		ArrayMap<String, Integer> groupUsers = new ArrayMap<>();

		long curTime = System.currentTimeMillis();
		PermissionUsages usages = new PermissionUsages(this);
		@@ -474,12 +474,12 @@ public final class PermissionControllerServiceImpl extends PermissionControllerS
		continue;
		}

		CharSequence groupLabel = groupUsage.getGroup().getName();
		Integer numUsers = groupUsers.get(groupLabel);
		String groupName = groupUsage.getGroup().getName();
		Integer numUsers = groupUsers.get(groupName);
		if (numUsers == null) {
		groupUsers.put(groupLabel, 1);
		groupUsers.put(groupName, 1);
		} else {
		groupUsers.put(groupLabel, numUsers + 1);
		groupUsers.put(groupName, numUsers + 1);
		}
		}
		}