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

RESTRICT AUTOMERGE Handling removing <original-package> tag am: 552bf38f66

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13922161

Change-Id: I07979cab182817b333b187718b91897cc7e4c7d5
This commit is contained in:
Patrick Baumann
2021-03-22 19:12:48 +00:00
committed by Automerger Merge Worker
parent ba7a1d3268 552bf38f66
commit f583d453f4
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3668,8 +3668,6 @@ public class PackageManagerService extends IPackageManager.Stub
PackageParser.readConfigUseRoundIcon(mContext.getResources()); PackageParser.readConfigUseRoundIcon(mContext.getResources());
mServiceStartWithDelay = SystemClock.uptimeMillis() + (60 * 1000L); mServiceStartWithDelay = SystemClock.uptimeMillis() + (60 * 1000L);
Slog.i(TAG, "Fix for b/169414761 is applied");
} }
/** /**

13
services/core/java/com/android/server/pm/PackageManagerShellCommand.java
View File

@@ -169,6 +169,8 @@ class PackageManagerShellCommand extends ShellCommand {
switch (cmd) { switch (cmd) {
case "path": case "path":
return runPath(); return runPath();
case "validate":
return runValidate();
case "dump": case "dump":
return runDump(); return runDump();
case "list": case "list":
@@ -323,6 +325,17 @@ class PackageManagerShellCommand extends ShellCommand {
return -1; return -1;
} }
private int runValidate() {
final PrintWriter pw = getOutPrintWriter();
String identifier = getNextArgRequired();
if ("169414761".equals(identifier)) {
pw.println("applied");
} else {
pw.println("missing");
}
return 0;
}
/** /**
* Shows module info * Shows module info
* *