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

Merge "Dump PackageInstaller state outside of mPackages lock" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-04 20:40:43 +00:00
committed by Android (Google) Code Review
parent 56a090bf37 09546ff639
commit 2b285566a4
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20853,13 +20853,6 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
mSettings.dumpRestoredPermissionGrantsLPr(pw, dumpState); 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) { if (!checkin && dumpState.isDumping(DumpState.DUMP_FROZEN) && packageName == null) {
// XXX should handle packageName != null by dumping only install data that // XXX should handle packageName != null by dumping only install data that
// the given package is involved with. // 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) { private void dumpProto(FileDescriptor fd) {

2
services/core/java/com/android/server/pm/Settings.java
View File

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