diff options
| -rw-r--r-- | services/core/java/com/android/server/rollback/Rollback.java | 21 | ||||
| -rw-r--r-- | services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java | 20 |
2 files changed, 0 insertions, 41 deletions
diff --git a/services/core/java/com/android/server/rollback/Rollback.java b/services/core/java/com/android/server/rollback/Rollback.java index b5da1c2ec58a..4d7af9cc0d44 100644 --- a/services/core/java/com/android/server/rollback/Rollback.java +++ b/services/core/java/com/android/server/rollback/Rollback.java @@ -182,15 +182,6 @@ class Rollback { private int mNumPackageSessionsWithSuccess; /** - * A temp flag to facilitate merging of the 2 rollback collections managed by - * RollbackManagerServiceImpl. True if this rollback is in the process of enabling and was - * originally managed by RollbackManagerServiceImpl#mNewRollbacks. - * TODO: remove this flag when merge is completed. - */ - @GuardedBy("mLock") - private boolean mIsNewRollback = false; - - /** * Constructs a new, empty Rollback instance. * * @param rollbackId the id of the rollback. @@ -838,18 +829,6 @@ class Rollback { } } - void setIsNewRollback(boolean newRollback) { - synchronized (mLock) { - mIsNewRollback = newRollback; - } - } - - boolean isNewRollback() { - synchronized (mLock) { - return mIsNewRollback; - } - } - static String rollbackStateToString(@RollbackState int state) { switch (state) { case Rollback.ROLLBACK_STATE_ENABLING: return "enabling"; diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java index e48fcf408056..59d93e16bae3 100644 --- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java +++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java @@ -795,7 +795,6 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { if (newRollback == null) { newRollback = createNewRollbackLocked(parentSession); mRollbacks.add(newRollback); - newRollback.setIsNewRollback(true); } } newRollback.addToken(token); @@ -1159,7 +1158,6 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { // TODO: refactor #completeEnableRollback so we won't remove 'rollback' from // mRollbacks here and add it back in #completeEnableRollback later. mRollbacks.remove(rollback); - rollback.setIsNewRollback(false); } // TODO: Now #completeEnableRollback returns the same rollback object as the // parameter on success. It would be more readable to return a boolean to indicate @@ -1354,22 +1352,4 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { } return null; } - - /** - * Returns the NewRollback associated with the given package session. - * Returns null if no NewRollback is found for the given package - * session. - */ - @WorkerThread - @GuardedBy("mLock") - Rollback getNewRollbackForPackageSessionLocked(int packageSessionId) { - // We expect mRollbacks to be a very small list; linear search - // should be plenty fast. - for (Rollback rollback: mRollbacks) { - if (rollback.isNewRollback() && rollback.containsSessionId(packageSessionId)) { - return rollback; - } - } - return null; - } } |