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

Merge "Sends the correct error code" into rvc-dev am: 50ec69fa09

Browse Source 
Change-Id: Ie9a31767920b5446ce2c87a683ff178e188a939e
This commit is contained in:
TreeHugger Robot
2020-05-11 22:02:49 +00:00
committed by Automerger Merge Worker
parent 918f98eb04 50ec69fa09
commit 72c7d05609
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1168,9 +1168,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
// as appropriate once all children have been processed
try {
PackageInstallerSession session = mSessionProvider.getSession(childSessionId);
if (!session.streamValidateAndCommit()) {
allSessionsReady = false;
}
allSessionsReady &= session.streamValidateAndCommit();
nonFailingSessions.add(session);
} catch (PackageManagerException e) {
allSessionsReady = false;
@@ -1179,10 +1177,14 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
}
}
}
// If we encountered any unrecoverable failures, destroy all
// other impacted sessions besides the parent; that will be cleaned up by the
// ChildStatusIntentReceiver.
// If we encountered any unrecoverable failures, destroy all other sessions including
// the parent
if (unrecoverableFailure != null) {
// {@link #streamValidateAndCommit()} calls
// {@link #onSessionVerificationFailure(PackageManagerException)}, but we don't
// expect it to ever do so for parent sessions. Call that on this parent to clean
// it up and notify listeners of the error.
onSessionVerificationFailure(unrecoverableFailure);
// fail other child sessions that did not already fail
for (int i = nonFailingSessions.size() - 1; i >= 0; --i) {
PackageInstallerSession session = nonFailingSessions.get(i);
@@ -1249,6 +1251,15 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
public void statusUpdate(Intent intent) {
mHandler.post(() -> {
if (mChildSessionsRemaining.size() == 0) {
// no children to deal with, ignore.
return;
}
final boolean destroyed;
synchronized (mLock) {
destroyed = mDestroyed;
}
if (destroyed) {
// the parent has already been terminated, ignore.
return;
}
final int sessionId = intent.getIntExtra(
@@ -1275,8 +1286,10 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
intent.putExtra(PackageInstaller.EXTRA_SESSION_ID,
PackageInstallerSession.this.sessionId);
mChildSessionsRemaining.clear(); // we're done. Don't send any more.
onSessionVerificationFailure(status,
intent.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE));
try {
mStatusReceiver.sendIntent(mContext, 0, intent, null, null);
} catch (IntentSender.SendIntentException ignore) {
}
}
});
}
@@ -1389,6 +1402,9 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub {
* @throws PackageManagerException on an unrecoverable error.
*/
private boolean streamValidateAndCommit() throws PackageManagerException {
// TODO(patb): since the work done here for a parent session in a multi-package install is
// mostly superficial, consider splitting this method for the parent and
// single / child sessions.
synchronized (mLock) {
if (mCommitted) {
return true;