Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13c433a6 authored by Patrick Baumann's avatar Patrick Baumann Committed by Android (Google) Code Review
Browse files

Merge changes I5d66c2b2,Ic11952e0 into rvc-qpr-dev 

* changes:
  RESTRICT AUTOMERGE Handling removing <original-package> tag
  RESTRICT AUTOMERGE Revert "Handling removing <original-package> tag"
parents 9941d8e0 552bf38f

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

+0 −2
Original line number Diff line number Diff line
@@ -3658,8 +3658,6 @@ public class PackageManagerService extends IPackageManager.Stub 
        PackageParser.readConfigUseRoundIcon(mContext.getResources());















        mServiceStartWithDelay = SystemClock.uptimeMillis() + (60 * 1000L);

























        Slog.i(TAG, "Fix for b/169414761 is applied");















    }





























    /**

























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



+13
−0




























Original line number
Diff line number
Diff line








@@ -168,6 +168,8 @@ class PackageManagerShellCommand extends ShellCommand {













            switch (cmd) {















                case "path":















                    return runPath();













                case "validate":













                    return runValidate();















                case "dump":















                    return runDump();















                case "list":










@@ -322,6 +324,17 @@ class PackageManagerShellCommand extends ShellCommand {













        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















     *