Merge "Revert "Only dump necessary info when specifying a package"" into sc-dev (7708fd97) · Commits · e / os / android_frameworks_base

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

+48 −88

Original line number	Diff line number	Diff line
		@@ -24838,12 +24838,12 @@ public class PackageManagerService extends IPackageManager.Stub
		pw.println("vers,1");
		}

		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_VERSION)
		&& packageName == null) {
		// dump version information for all volumes with installed packages
		// reader
		if (dumpState.isDumping(DumpState.DUMP_VERSION) && packageName == null) {
		if (!checkin) {
		dump(DumpState.DUMP_VERSION, fd, pw, dumpState);
		}
		}

		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_KNOWN_PACKAGES)
		@@ -24873,8 +24873,7 @@ public class PackageManagerService extends IPackageManager.Stub
		ipw.decreaseIndent();
		}

		if (dumpState.isDumping(DumpState.DUMP_VERIFIERS)
		&& packageName == null) {
		if (dumpState.isDumping(DumpState.DUMP_VERIFIERS) && packageName == null) {
		final String requiredVerifierPackage = mRequiredVerifierPackage;
		if (!checkin) {
		if (dumpState.onTitlePrinted()) {
		@@ -24895,8 +24894,7 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		}

		if (dumpState.isDumping(DumpState.DUMP_DOMAIN_VERIFIER)
		&& packageName == null) {
		if (dumpState.isDumping(DumpState.DUMP_DOMAIN_VERIFIER) && packageName == null) {
		final DomainVerificationProxy proxy = mDomainVerificationManager.getProxy();
		final ComponentName verifierComponent = proxy.getComponentName();
		if (verifierComponent != null) {
		@@ -24923,13 +24921,11 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		}

		if (dumpState.isDumping(DumpState.DUMP_LIBS)
		&& packageName == null) {
		if (dumpState.isDumping(DumpState.DUMP_LIBS) && packageName == null) {
		dump(DumpState.DUMP_LIBS, fd, pw, dumpState);
		}

		if (dumpState.isDumping(DumpState.DUMP_FEATURES)
		&& packageName == null) {
		if (dumpState.isDumping(DumpState.DUMP_FEATURES) && packageName == null) {
		if (dumpState.onTitlePrinted()) {
		pw.println();
		}
		@@ -24939,7 +24935,12 @@ public class PackageManagerService extends IPackageManager.Stub

		synchronized (mAvailableFeatures) {
		for (FeatureInfo feat : mAvailableFeatures.values()) {
		if (!checkin) {
		if (checkin) {
		pw.print("feat,");
		pw.print(feat.name);
		pw.print(",");
		pw.println(feat.version);
		} else {
		pw.print(" ");
		pw.print(feat.name);
		if (feat.version > 0) {
		@@ -24947,73 +24948,55 @@ public class PackageManagerService extends IPackageManager.Stub
		pw.print(feat.version);
		}
		pw.println();
		} else {
		pw.print("feat,");
		pw.print(feat.name);
		pw.print(",");
		pw.println(feat.version);
		}
		}
		}
		}

		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_ACTIVITY_RESOLVERS)) {
		if (!checkin && dumpState.isDumping(DumpState.DUMP_ACTIVITY_RESOLVERS)) {
		synchronized (mLock) {
		mComponentResolver.dumpActivityResolvers(pw, dumpState, packageName);
		}
		}
		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_RECEIVER_RESOLVERS)) {
		if (!checkin && dumpState.isDumping(DumpState.DUMP_RECEIVER_RESOLVERS)) {
		synchronized (mLock) {
		mComponentResolver.dumpReceiverResolvers(pw, dumpState, packageName);
		}
		}
		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_SERVICE_RESOLVERS)) {
		if (!checkin && dumpState.isDumping(DumpState.DUMP_SERVICE_RESOLVERS)) {
		synchronized (mLock) {
		mComponentResolver.dumpServiceResolvers(pw, dumpState, packageName);
		}
		}
		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_CONTENT_RESOLVERS)) {
		if (!checkin && dumpState.isDumping(DumpState.DUMP_CONTENT_RESOLVERS)) {
		synchronized (mLock) {
		mComponentResolver.dumpProviderResolvers(pw, dumpState, packageName);
		}
		}

		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_PREFERRED)
		&& packageName == null) {
		if (!checkin && dumpState.isDumping(DumpState.DUMP_PREFERRED)) {
		dump(DumpState.DUMP_PREFERRED, fd, pw, dumpState);
		}

		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_PREFERRED_XML)
		&& packageName == null) {
		if (!checkin && dumpState.isDumping(DumpState.DUMP_PREFERRED_XML)) {
		dump(DumpState.DUMP_PREFERRED_XML, fd, pw, dumpState);
		}

		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_DOMAIN_PREFERRED)
		&& packageName == null) {
		if (!checkin && dumpState.isDumping(DumpState.DUMP_DOMAIN_PREFERRED)) {
		dump(DumpState.DUMP_DOMAIN_PREFERRED, fd, pw, dumpState);
		}

		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_PERMISSIONS)) {
		if (!checkin && dumpState.isDumping(DumpState.DUMP_PERMISSIONS)) {
		mSettings.dumpPermissions(pw, packageName, permissionNames, dumpState);
		}

		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_PROVIDERS)) {
		if (!checkin && dumpState.isDumping(DumpState.DUMP_PROVIDERS)) {
		synchronized (mLock) {
		mComponentResolver.dumpContentProviders(pw, dumpState, packageName);
		}
		}

		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_KEYSETS)) {
		if (!checkin && dumpState.isDumping(DumpState.DUMP_KEYSETS)) {
		synchronized (mLock) {
		mSettings.getKeySetManagerService().dumpLPr(pw, packageName, dumpState);
		}
		@@ -25028,15 +25011,11 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		}

		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_QUERIES)
		&& packageName == null) {
		if (dumpState.isDumping(DumpState.DUMP_QUERIES)) {
		dump(DumpState.DUMP_QUERIES, fd, pw, dumpState);
		}

		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_SHARED_USERS)
		&& packageName == null) {
		if (dumpState.isDumping(DumpState.DUMP_SHARED_USERS)) {
		// This cannot be moved to ComputerEngine since the set of packages in the
		// SharedUserSetting do not have a copy.
		synchronized (mLock) {
		@@ -25044,9 +25023,7 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		}

		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_CHANGES)
		&& packageName == null) {
		if (dumpState.isDumping(DumpState.DUMP_CHANGES)) {
		if (dumpState.onTitlePrinted()) pw.println();
		pw.println("Package Changes:");
		synchronized (mLock) {
		@@ -25073,9 +25050,7 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		}

		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_FROZEN)
		&& packageName == null) {
		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.
		if (dumpState.onTitlePrinted()) pw.println();
		@@ -25096,9 +25071,7 @@ public class PackageManagerService extends IPackageManager.Stub
		ipw.decreaseIndent();
		}

		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_VOLUMES)
		&& packageName == null) {
		if (!checkin && dumpState.isDumping(DumpState.DUMP_VOLUMES) && packageName == null) {
		if (dumpState.onTitlePrinted()) pw.println();

		final IndentingPrintWriter ipw = new IndentingPrintWriter(pw, " ", 120);
		@@ -25117,31 +25090,24 @@ public class PackageManagerService extends IPackageManager.Stub
		ipw.decreaseIndent();
		}

		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_SERVICE_PERMISSIONS)
		if (!checkin && dumpState.isDumping(DumpState.DUMP_SERVICE_PERMISSIONS)
		&& packageName == null) {
		synchronized (mLock) {
		mComponentResolver.dumpServicePermissions(pw, dumpState);
		}
		}

		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_DEXOPT)
		&& packageName == null) {
		if (!checkin && dumpState.isDumping(DumpState.DUMP_DEXOPT)) {
		if (dumpState.onTitlePrinted()) pw.println();
		dump(DumpState.DUMP_DEXOPT, fd, pw, dumpState);
		}

		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_COMPILER_STATS)
		&& packageName == null) {
		if (!checkin && dumpState.isDumping(DumpState.DUMP_COMPILER_STATS)) {
		if (dumpState.onTitlePrinted()) pw.println();
		dump(DumpState.DUMP_COMPILER_STATS, fd, pw, dumpState);
		}

		if (dumpState.isDumping(DumpState.DUMP_MESSAGES)
		&& packageName == null) {
		if (!checkin) {
		if (!checkin && dumpState.isDumping(DumpState.DUMP_MESSAGES) && packageName == null) {
		if (dumpState.onTitlePrinted()) pw.println();
		synchronized (mLock) {
		mSettings.dumpReadMessagesLPr(pw, dumpState);
		@@ -25149,29 +25115,25 @@ public class PackageManagerService extends IPackageManager.Stub
		pw.println();
		pw.println("Package warning messages:");
		dumpCriticalInfo(pw, null);
		} else {
		dumpCriticalInfo(pw, "msg,");
		}

		if (checkin && dumpState.isDumping(DumpState.DUMP_MESSAGES)) {
		dumpCriticalInfo(pw, "msg,");
		}

		// PackageInstaller should be called outside of mPackages lock
		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_INSTALLS)
		&& packageName == null) {
		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_APEX)
		&& packageName == null) {
		if (!checkin && dumpState.isDumping(DumpState.DUMP_APEX)) {
		mApexManager.dump(pw, packageName);
		}

		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_PER_UID_READ_TIMEOUTS)
		if (!checkin && dumpState.isDumping(DumpState.DUMP_PER_UID_READ_TIMEOUTS)
		&& packageName == null) {
		pw.println();
		pw.println("Per UID read timeouts:");
		@@ -25190,9 +25152,7 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		}

		if (!checkin
		&& dumpState.isDumping(DumpState.DUMP_SNAPSHOT_STATISTICS)
		&& packageName == null) {
		if (!checkin && dumpState.isDumping(DumpState.DUMP_SNAPSHOT_STATISTICS)) {
		pw.println("Snapshot statistics");
		if (!mSnapshotEnabled) {
		pw.println(" Snapshots disabled");