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

Commit 9c6da834 authored by JW Wang's avatar JW Wang
Browse files

Remove #mNewRollbacks (10/n) 

mNewRollbacks now is always empty and unsed. We can safely remove it
now.

Bug: 147400979
Test: atest RollbackTest
Change-Id: I31f6b981a9a3eedeb8ef645e93aea1e6d5a7e4e5
parent 70bdd979

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

+0 −26
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import android.os.SystemClock; 
import android.os.UserHandle;

import android.os.UserManager;

import android.provider.DeviceConfig;

import android.util.ArraySet;

import android.util.IntArray;

import android.util.Log;

import android.util.LongArrayQueue;
@@ -121,10 +120,6 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { 
    @GuardedBy("mLock")

    private final SparseBooleanArray mAllocatedRollbackIds = new SparseBooleanArray();



    // Rollbacks we are in the process of enabling.

    @GuardedBy("mLock")

    private final Set<Rollback> mNewRollbacks = new ArraySet<>();



    // The list of all rollbacks, including available and committed rollbacks.

    @GuardedBy("mLock")

    private final List<Rollback> mRollbacks;
@@ -442,15 +437,6 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { 
                    rollback.delete(mAppDataRollbackHelper);

                }

            }

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

            while (iter2.hasNext()) {

                Rollback newRollback = iter2.next();

                if (newRollback.includesPackage(packageName)) {

                    iter2.remove();

                    newRollback.delete(mAppDataRollbackHelper);

                }



            }

        }

    }
@@ -826,13 +812,6 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { 
        }



        synchronized (mLock) {

            Rollback newRollback = getNewRollbackForPackageSessionLocked(sessionId);

            if (newRollback != null) {

                Slog.w(TAG, "Delete new rollback id=" + newRollback.info.getRollbackId()

                        + " for session id=" + sessionId);

                mNewRollbacks.remove(newRollback);

                newRollback.delete(mAppDataRollbackHelper);

            }

            Iterator<Rollback> iter = mRollbacks.iterator();

            while (iter.hasNext()) {

                Rollback rollback = iter.next();
@@ -968,15 +947,10 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { 
                    + " users=" + Arrays.toString(userIds));

        }

        synchronized (mLock) {

            // staged installs

            for (int i = 0; i < mRollbacks.size(); i++) {

                Rollback rollback = mRollbacks.get(i);

                rollback.snapshotUserData(packageName, userIds, mAppDataRollbackHelper);

            }

            // non-staged installs

            for (Rollback rollback : mNewRollbacks) {

                rollback.snapshotUserData(packageName, userIds, mAppDataRollbackHelper);

            }

        }

    }