Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e19adeff authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 06cda101: am 5caab604: am bf6fbb00: Merge "Ignore abandon after install... 

am 06cda101: am 5caab604: am bf6fbb00: Merge "Ignore abandon after install relinquished." into mnc-dev

* commit '06cda101':
  Ignore abandon after install relinquished.
parents b42d7926 06cda101

services/core/java/com/android/server/pm/PackageInstallerSession.java

+9 −2
Original line number Original line Diff line number Diff line
@@ -127,6 +127,8 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
    @GuardedBy("mLock")

    @GuardedBy("mLock")

    private boolean mPermissionsAccepted = false;

    private boolean mPermissionsAccepted = false;

    @GuardedBy("mLock")

    @GuardedBy("mLock")

    private boolean mRelinquished = false;

    @GuardedBy("mLock")

    private boolean mDestroyed = false;

    private boolean mDestroyed = false;





    private int mFinalStatus;

    private int mFinalStatus;
@@ -557,6 +559,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            user = new UserHandle(userId);

            user = new UserHandle(userId);

        }

        }





        mRelinquished = true;

        mPm.installStage(mPackageName, stageDir, stageCid, localObserver, params,

        mPm.installStage(mPackageName, stageDir, stageCid, localObserver, params,

                installerPackageName, installerUid, user);

                installerPackageName, installerUid, user);

    }

    }
@@ -928,6 +931,10 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 




    @Override

    @Override

    public void abandon() {

    public void abandon() {

        if (mRelinquished) {

            Slog.d(TAG, "Ignoring abandon after commit relinquished control");

            return;

        }

        destroyInternal();

        destroyInternal();

        dispatchSessionFinished(INSTALL_FAILED_ABORTED, "Session was abandoned", null);

        dispatchSessionFinished(INSTALL_FAILED_ABORTED, "Session was abandoned", null);

    }

    }
@@ -958,8 +965,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            }

            }

        }

        }

        if (stageDir != null) {

        if (stageDir != null) {

            FileUtils.deleteContents(stageDir);

            mPm.mInstaller.rmPackageDir(stageDir.getAbsolutePath());

            stageDir.delete();

        }

        }

        if (stageCid != null) {

        if (stageCid != null) {

            PackageHelper.destroySdDir(stageCid);

            PackageHelper.destroySdDir(stageCid);
@@ -990,6 +996,7 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        pw.printPair("mProgress", mProgress);

        pw.printPair("mProgress", mProgress);

        pw.printPair("mSealed", mSealed);

        pw.printPair("mSealed", mSealed);

        pw.printPair("mPermissionsAccepted", mPermissionsAccepted);

        pw.printPair("mPermissionsAccepted", mPermissionsAccepted);

        pw.printPair("mRelinquished", mRelinquished);

        pw.printPair("mDestroyed", mDestroyed);

        pw.printPair("mDestroyed", mDestroyed);

        pw.printPair("mBridges", mBridges.size());

        pw.printPair("mBridges", mBridges.size());

        pw.printPair("mFinalStatus", mFinalStatus);

        pw.printPair("mFinalStatus", mFinalStatus);