Merge "Dump PackageInstaller state outside of mPackages lock" into oc-dev am: 2b285566a4 (e9018108) · Commits · e / os / android_frameworks_base

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

+8 −7

Original line number	Diff line number	Diff line
		@@ -20853,13 +20853,6 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
		mSettings.dumpRestoredPermissionGrantsLPr(pw, dumpState);
		}

		if (!checkin && dumpState.isDumping(DumpState.DUMP_INSTALLS) && packageName == null) {
		// XXX should handle packageName != null by dumping only install data that
		// the given package is involved with.
		if (dumpState.onTitlePrinted()) pw.println();
		mInstallerService.dump(new IndentingPrintWriter(pw, " ", 120));
		}

		if (!checkin && dumpState.isDumping(DumpState.DUMP_FROZEN) && packageName == null) {
		// XXX should handle packageName != null by dumping only install data that
		// the given package is involved with.
		@@ -20930,6 +20923,14 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
		}
		}
		}

		// PackageInstaller should be called outside of mPackages lock
		if (!checkin && dumpState.isDumping(DumpState.DUMP_INSTALLS) && packageName == null) {
		// XXX should handle packageName != null by dumping only install data that
		// the given package is involved with.
		if (dumpState.onTitlePrinted()) pw.println();
		mInstallerService.dump(new IndentingPrintWriter(pw, " ", 120));
		}
		}

		private void dumpProto(FileDescriptor fd) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -4777,7 +4777,7 @@ final class Settings {
		pw.print(" notLaunched=");
		pw.print(ps.getNotLaunched(user.id));
		pw.print(" enabled=");
		pw.println(ps.getEnabled(user.id));
		pw.print(ps.getEnabled(user.id));
		pw.print(" instant=");
		pw.println(ps.getInstantApp(user.id));
		String lastDisabledAppCaller = ps.getLastDisabledAppCaller(user.id);