summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Todd Kennedy <toddke@google.com> 2016-10-07 14:29:04 +0000
committer android-build-merger <android-build-merger@google.com> 2016-10-07 14:29:04 +0000
commitdff735d1090ae27a3059617dd1864b7fed44033e (patch)
treea1b5015501c6394a07cc0cced6625ad11d41a4d9
parent05efd16c46c6f5c607f4604fb2cf48b4ea430382 (diff)
parentd220683d339256790813348beedabe061aca643c (diff)
Force APKs to be streamed
am: d220683d33 Change-Id: I17a44d4b985a08b565d8c287cfee573cacb0216c
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerShellCommand.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
index 07dc404e08db..251b2773aa6b 100644
--- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
+++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
@@ -1146,14 +1146,15 @@ class PackageManagerShellCommand extends ShellCommand {
private int doWriteSplit(int sessionId, String inPath, long sizeBytes, String splitName,
boolean logSuccess) throws RemoteException {
final PrintWriter pw = getOutPrintWriter();
- if ("-".equals(inPath)) {
- inPath = null;
- } else if (inPath != null) {
- final File file = new File(inPath);
- if (file.isFile()) {
- sizeBytes = file.length();
- }
+ if (sizeBytes <= 0) {
+ pw.println("Error: must specify a APK size");
+ return 1;
+ }
+ if (inPath != null && !"-".equals(inPath)) {
+ pw.println("Error: APK content must be streamed");
+ return 1;
}
+ inPath = null;
final SessionInfo info = mInterface.getPackageInstaller().getSessionInfo(sessionId);