Merge "Null safe package name in AppOps writeState" into sc-dev (0abd07b3) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/appop/AppOpsService.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -5099,14 +5099,16 @@ public class AppOpsService extends IAppOpsService.Stub {
		String lastPkg = null;
		for (int i=0; i<allOps.size(); i++) {
		AppOpsManager.PackageOps pkg = allOps.get(i);
		if (!pkg.getPackageName().equals(lastPkg)) {
		if (!Objects.equals(pkg.getPackageName(), lastPkg)) {
		if (lastPkg != null) {
		out.endTag(null, "pkg");
		}
		lastPkg = pkg.getPackageName();
		if (lastPkg != null) {
		out.startTag(null, "pkg");
		out.attribute(null, "n", lastPkg);
		}
		}
		out.startTag(null, "uid");
		out.attributeInt(null, "n", pkg.getUid());
		List<AppOpsManager.OpEntry> ops = pkg.getOps();