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

Merge changes from topic "bug148688328_invalidate_rollback"

Browse Source 
* changes:
  Delete rollbacks when build fingerprint has changed (1/n)
  Remove unused code (5/n)
  Rewrite the handling of session finished with success (4/n)
  Use #getRollbackForSessionLocked to search for the rollback (3/n)
This commit is contained in:
JW Wang
2020-02-11 03:18:45 +00:00
committed by Android (Google) Code Review
parent 1f11233375 529d3aa46b
commit 04836c2b82
2 changed files with 27 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/rollback/Rollback.java
View File

@@ -180,15 +180,6 @@ class Rollback {
@GuardedBy("mLock")
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.
*
@@ -837,18 +828,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";

66
services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
View File

@@ -164,8 +164,16 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
// Load rollback data from device storage.
synchronized (mLock) {
mRollbacks = mRollbackStore.loadRollbacks();
for (Rollback rollback : mRollbacks) {
mAllocatedRollbackIds.put(rollback.info.getRollbackId(), true);
if (!context.getPackageManager().isDeviceUpgrading()) {
for (Rollback rollback : mRollbacks) {
mAllocatedRollbackIds.put(rollback.info.getRollbackId(), true);
}
} else {
// Delete rollbacks when build fingerprint has changed.
for (Rollback rollback : mRollbacks) {
rollback.delete(mAppDataRollbackHelper);
}
mRollbacks.clear();
}
}
@@ -788,14 +796,13 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
Rollback newRollback;
synchronized (mLock) {
// See if we already have a NewRollback that contains this package
// session. If not, create a NewRollback for the parent session
// See if we already have a Rollback that contains this package
// session. If not, create a new Rollback for the parent session
// that we will use for all the packages in the session.
newRollback = getNewRollbackForPackageSessionLocked(packageSession.getSessionId());
newRollback = getRollbackForSessionLocked(packageSession.getSessionId());
if (newRollback == null) {
newRollback = createNewRollbackLocked(parentSession);
mRollbacks.add(newRollback);
newRollback.setIsNewRollback(true);
}
}
newRollback.addToken(token);
@@ -1148,24 +1155,23 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
}
if (success) {
Rollback newRollback;
Rollback rollback;
synchronized (mLock) {
newRollback = getNewRollbackForPackageSessionLocked(sessionId);
if (newRollback != null && newRollback.notifySessionWithSuccess()) {
mRollbacks.remove(newRollback);
newRollback.setIsNewRollback(false);
} else {
// Not all child sessions finished with success.
// Don't enable the rollback yet.
newRollback = null;
rollback = getRollbackForSessionLocked(sessionId);
if (rollback == null || rollback.isStaged() || !rollback.isEnabling()
|| !rollback.notifySessionWithSuccess()) {
return;
}
// All child sessions finished with success. We can enable this rollback now.
// TODO: refactor #completeEnableRollback so we won't remove 'rollback' from
// mRollbacks here and add it back in #completeEnableRollback later.
mRollbacks.remove(rollback);
}
if (newRollback != null) {
Rollback rollback = completeEnableRollback(newRollback);
if (rollback != null && !rollback.isStaged()) {
makeRollbackAvailable(rollback);
}
// TODO: Now #completeEnableRollback returns the same rollback object as the
// parameter on success. It would be more readable to return a boolean to indicate
// success or failure.
if (completeEnableRollback(rollback) != null) {
makeRollbackAvailable(rollback);
}
} else {
synchronized (mLock) {
@@ -1354,22 +1360,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;
}
}