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

Merge "Improve exception in validate{Apex,Apk}InstallLocked" into rvc-dev

Browse Source
This commit is contained in:
Nikita Ioffe
2020-04-07 16:27:35 +00:00
committed by Android (Google) Code Review
parent 77d7bcc124 961c7efbb0
commit 7f636ea3de
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/PackageInstallerSession.java
View File

@@ -1830,7 +1830,9 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
throws PackageManagerException {
final List<File> addedFiles = getAddedApksLocked();
if (addedFiles.isEmpty()) {
throw new PackageManagerException(INSTALL_FAILED_INVALID_APK, "No packages staged");
throw new PackageManagerException(INSTALL_FAILED_INVALID_APK,
String.format("Session: %d. No packages staged in %s", sessionId,
stageDir.getAbsolutePath()));
}
if (ArrayUtils.size(addedFiles) > 1) {
@@ -1921,7 +1923,9 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
final List<File> addedFiles = getAddedApksLocked();
if (addedFiles.isEmpty() && removeSplitList.size() == 0) {
throw new PackageManagerException(INSTALL_FAILED_INVALID_APK, "No packages staged");
throw new PackageManagerException(INSTALL_FAILED_INVALID_APK,
String.format("Session: %d. No packages staged in %s", sessionId,
stageDir.getAbsolutePath()));
}
// Verify that all staged packages are internally consistent