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

Merge "Force APKs to be streamed" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-10-07 14:21:26 +00:00
committed by Android (Google) Code Review
parent fd6846e116 d220683d33
commit dd100f4298
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/pm/PackageManagerShellCommand.java
View File

@@ -1146,14 +1146,15 @@ class PackageManagerShellCommand extends ShellCommand {
private int doWriteSplit(int sessionId, String inPath, long sizeBytes, String splitName, private int doWriteSplit(int sessionId, String inPath, long sizeBytes, String splitName,
boolean logSuccess) throws RemoteException { boolean logSuccess) throws RemoteException {
final PrintWriter pw = getOutPrintWriter(); final PrintWriter pw = getOutPrintWriter();
if ("-".equals(inPath)) { if (sizeBytes <= 0) {
inPath = null; pw.println("Error: must specify a APK size");
} else if (inPath != null) { return 1;
final File file = new File(inPath);
if (file.isFile()) {
sizeBytes = file.length();
}
} }
if (inPath != null && !"-".equals(inPath)) {
pw.println("Error: APK content must be streamed");
return 1;
}
inPath = null;
final SessionInfo info = mInterface.getPackageInstaller().getSessionInfo(sessionId); final SessionInfo info = mInterface.getPackageInstaller().getSessionInfo(sessionId);