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

Commit b481075f authored by JW Wang's avatar JW Wang
Browse files

Remove a NewRollback immediately when cancelled (1/n) 

This change allows us to remove #isCancelled and #setCancelled. By
reducing the difference b/t NewRollback and Rollback, it will be easier
to merge them later.

Bug: 147400979
Test: atest RollbackTest
Change-Id: I9bf626f252e828994b435f96ec429265fcec4ece
parent 36620190

services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java

+13 −39
Original line number Diff line number Diff line
@@ -235,12 +235,17 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { 
                        Slog.v(TAG, "broadcast=ACTION_CANCEL_ENABLE_ROLLBACK token=" + token);

                    }

                    synchronized (mLock) {

                        NewRollback found = null;

                        for (NewRollback rollback : mNewRollbacks) {

                            if (rollback.hasToken(token)) {

                                rollback.setCancelled();

                                return;

                                found = rollback;

                                break;

                            }

                        }

                        if (found != null) {

                            mNewRollbacks.remove(found);

                            found.rollback.delete(mAppDataRollbackHelper);

                        }

                    }

                }

            }
@@ -433,10 +438,14 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { 
                    rollback.delete(mAppDataRollbackHelper);

                }

            }

            for (NewRollback newRollback : mNewRollbacks) {

            Iterator<NewRollback> iter2 = mNewRollbacks.iterator();

            while (iter2.hasNext()) {

                NewRollback newRollback = iter2.next();

                if (newRollback.rollback.includesPackage(packageName)) {

                    newRollback.setCancelled();

                    iter2.remove();

                    newRollback.rollback.delete(mAppDataRollbackHelper);

                }



            }

        }

    }
@@ -1220,12 +1229,6 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { 
            Slog.v(TAG, "completeEnableRollback id=" + rollback.info.getRollbackId());

        }



        if (newRollback.isCancelled()) {

            Slog.e(TAG, "Rollback has been cancelled by PackageManager");

            rollback.delete(mAppDataRollbackHelper);

            return null;

        }



        // We are checking if number of packages (excluding apk-in-apex) we enabled for rollback is

        // equal to the number of sessions we are installing, to ensure we didn't skip enabling

        // of any sessions. If we successfully enable an apex, then we can assume we enabled
@@ -1348,9 +1351,6 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { 
         */

        private final int[] mPackageSessionIds;



        @GuardedBy("mNewRollbackLock")

        private boolean mIsCancelled = false;



        /**

         * The number of sessions in the install which are notified with success by

         * {@link PackageInstaller.SessionCallback#onFinished(int, boolean)}.
@@ -1386,32 +1386,6 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { 
            }

        }



        /**

         * Returns true if this NewRollback has been cancelled.

         *

         * <p>Rollback could be invalidated and cancelled if RollbackManager receives

         * {@link Intent#ACTION_CANCEL_ENABLE_ROLLBACK} from {@link PackageManager}.

         *

         * <p>The main underlying assumption here is that if enabling the rollback times out, then

         * {@link PackageManager} will NOT send

         * {@link PackageInstaller.SessionCallback#onFinished(int, boolean)} before it broadcasts

         * {@link Intent#ACTION_CANCEL_ENABLE_ROLLBACK}.

         */

        boolean isCancelled() {

            synchronized (mNewRollbackLock) {

                return mIsCancelled;

            }

        }



        /**

         * Sets this NewRollback to be marked as cancelled.

         */

        void setCancelled() {

            synchronized (mNewRollbackLock) {

                mIsCancelled = true;

            }

        }



        /**

         * Returns true if this NewRollback contains the provided {@code packageSessionId}.

         */