Merge "Streaming installation: allow non-v4-signed files (e.g. .dm)" into rvc-dev am: d060004e6a

Change-Id: I02b98c40c5b5d6036252361635ededb71e86ec3e
2020-05-13 16:14:25 +00:00
parent 64cda08372 d060004e6a
commit 718a0d8375
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
+++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
@@ -3172,7 +3172,7 @@ class PackageManagerShellCommand extends ShellCommand {
            metadata = (streamingVersion == 0) ? Metadata.forDataOnlyStreaming(fileId)
                    : Metadata.forStreaming(fileId);
            try {
-                if (V4Signature.readFrom(signature) == null) {
+                if ((signature.length > 0) && (V4Signature.readFrom(signature) == null)) {
                    getErrPrintWriter().println("V4 signature is invalid in: " + arg);
                    return 1;
                }