From 14d5cc48efc34e5dcb3f2908703c52e5c28f05b5 Mon Sep 17 00:00:00 2001
From: Alex Buynytskyy <alexbuy@google.com>
Date: Tue, 12 May 2020 09:14:10 -0700
Subject: [PATCH] Streaming installation: allow non-v4-signed files (e.g. .dm)

Without this change, we can't install apk-s with dm-s.

Bug: b/150803885
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest
Change-Id: I2af87d56560b17f5a5386b55d8d3afb8c6c861f2
---
 .../java/com/android/server/pm/PackageManagerShellCommand.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
index bc94528c07f08..0dc4d131640cb 100644
--- 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;
                 }