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

Merge changes I5d66c2b2,Ic11952e0 into rvc-qpr-dev

Browse Source 
* changes:
  RESTRICT AUTOMERGE Handling removing <original-package> tag
  RESTRICT AUTOMERGE Revert "Handling removing <original-package> tag"
This commit is contained in:
Patrick Baumann
2021-03-22 16:54:17 +00:00
committed by Android (Google) Code Review
parent 9941d8e007 552bf38f66
commit 13c433a651
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

@@ -3658,8 +3658,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

@@ -168,6 +168,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":
@@ -322,6 +324,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
* *