Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Only dump necessary info when specifying a package"

Browse Source 
This reverts commit 9b34cca80f.

Reason for revert: restore info for S to not break tooling, can re-consider for T

Bug: 191386282

Change-Id: I3e6919c5ce8073f22c860e1be59264668643d910
This commit is contained in:
Winson Chiu
2021-07-30 19:19:03 +00:00
parent 9b34cca80f
commit d71a80ccde
1 changed files with 48 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -23967,11 +23967,11 @@ 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
dump(DumpState.DUMP_VERSION, fd, pw, dumpState);
// reader
if (dumpState.isDumping(DumpState.DUMP_VERSION) && packageName == null) {
if (!checkin) {
dump(DumpState.DUMP_VERSION, fd, pw, dumpState);
}
}
if (!checkin
@@ -24002,8 +24002,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()) {
@@ -24024,8 +24023,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) {
@@ -24052,13 +24050,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();
}
@@ -24068,7 +24064,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) {
@@ -24076,73 +24077,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);
}
@@ -24157,15 +24140,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) {
@@ -24173,9 +24152,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) {
@@ -24202,9 +24179,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();
@@ -24225,9 +24200,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);
@@ -24246,61 +24219,50 @@ 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 (dumpState.onTitlePrinted()) pw.println();
synchronized (mLock) {
mSettings.dumpReadMessagesLPr(pw, dumpState);
}
pw.println();
pw.println("Package warning messages:");
dumpCriticalInfo(pw, null);
} else {
dumpCriticalInfo(pw, "msg,");
if (!checkin && dumpState.isDumping(DumpState.DUMP_MESSAGES) && packageName == null) {
if (dumpState.onTitlePrinted()) pw.println();
synchronized (mLock) {
mSettings.dumpReadMessagesLPr(pw, dumpState);
}
pw.println();
pw.println("Package warning messages:");
dumpCriticalInfo(pw, null);
}
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:");
@@ -24319,9 +24281,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");