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

Support split APKs in staged installs.

Browse Source 
Fix: 123629153
Bug: 124807191
Test: installed a mainline module containing one base apk plus two
splits.

Change-Id: I8f6707370188fff9407dd00ff5d90bb83937657e
This commit is contained in:
Dario Freni
2019-02-20 14:09:36 +00:00
parent 9599d06761
commit 815bd21abc
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
services/core/java/com/android/server/pm/StagingManager.java
View File

@@ -295,30 +295,29 @@ public class StagingManager {
}
}
private String findFirstAPKInDir(File stageDir) {
private List<String> findAPKsInDir(File stageDir) {
List<String> ret = new ArrayList<>();
if (stageDir != null && stageDir.exists()) {
for (File file : stageDir.listFiles()) {
if (file.getAbsolutePath().toLowerCase().endsWith(".apk")) {
return file.getAbsolutePath();
ret.add(file.getAbsolutePath());
}
}
}
return null;
return ret;
}
private PackageInstallerSession createAndWriteApkSession(
@NonNull PackageInstallerSession originalSession) {
// TODO(b/123629153): support split APKs.
if (originalSession.stageDir == null) {
Slog.wtf(TAG, "Attempting to install a staged APK session with no staging dir");
return null;
}
String apkFilePath = findFirstAPKInDir(originalSession.stageDir);
if (apkFilePath == null) {
List<String> apkFilePaths = findAPKsInDir(originalSession.stageDir);
if (apkFilePaths.isEmpty()) {
Slog.w(TAG, "Can't find staged APK in " + originalSession.stageDir.getAbsolutePath());
return null;
}
File apkFile = new File(apkFilePath);
PackageInstaller.SessionParams params = originalSession.params.copy();
params.isStaged = false;
@@ -329,14 +328,17 @@ public class StagingManager {
try {
apkSession.open();
ParcelFileDescriptor pfd = ParcelFileDescriptor.open(apkFile,
ParcelFileDescriptor.MODE_READ_ONLY);
long sizeBytes = pfd.getStatSize();
if (sizeBytes < 0) {
Slog.e(TAG, "Unable to get size of: " + apkFilePath);
return null;
for (String apkFilePath : apkFilePaths) {
File apkFile = new File(apkFilePath);
ParcelFileDescriptor pfd = ParcelFileDescriptor.open(apkFile,
ParcelFileDescriptor.MODE_READ_ONLY);
long sizeBytes = pfd.getStatSize();
if (sizeBytes < 0) {
Slog.e(TAG, "Unable to get size of: " + apkFilePath);
return null;
}
apkSession.write(apkFile.getName(), 0, sizeBytes, pfd);
}
apkSession.write(apkFile.getName(), 0, sizeBytes, pfd);
} catch (IOException e) {
Slog.e(TAG, "Failure to install APK staged session " + originalSession.sessionId, e);
return null;