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

Merge "Handles pre-process failure without crashing system" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-30 17:02:17 +00:00
committed by Android (Google) Code Review
parent e4de9d2c56 2ef05dca3f
commit b8735359aa
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -15032,24 +15032,26 @@ public class PackageManagerService extends IPackageManager.Stub
void tryProcessInstallRequest(InstallArgs args, int currentStatus) { void tryProcessInstallRequest(InstallArgs args, int currentStatus) {
mCurrentState.put(args, currentStatus); mCurrentState.put(args, currentStatus);
boolean success = true;
if (mCurrentState.size() != mChildParams.size()) { if (mCurrentState.size() != mChildParams.size()) {
return; return;
} }
int completeStatus = PackageManager.INSTALL_SUCCEEDED;
for (Integer status : mCurrentState.values()) { for (Integer status : mCurrentState.values()) {
if (status == PackageManager.INSTALL_UNKNOWN) { if (status == PackageManager.INSTALL_UNKNOWN) {
return; return;
} else if (status != PackageManager.INSTALL_SUCCEEDED) { } else if (status != PackageManager.INSTALL_SUCCEEDED) {
success = false; completeStatus = status;
break; break;
} }
} }
final List<InstallRequest> installRequests = new ArrayList<>(mCurrentState.size()); final List<InstallRequest> installRequests = new ArrayList<>(mCurrentState.size());
for (Map.Entry<InstallArgs, Integer> entry : mCurrentState.entrySet()) { for (Map.Entry<InstallArgs, Integer> entry : mCurrentState.entrySet()) {
installRequests.add(new InstallRequest(entry.getKey(), installRequests.add(new InstallRequest(entry.getKey(),
createPackageInstalledInfo(entry.getValue()))); createPackageInstalledInfo(completeStatus)));
} }
processInstallRequestsAsync(success, installRequests); processInstallRequestsAsync(
completeStatus == PackageManager.INSTALL_SUCCEEDED,
installRequests);
} }
} }