Merge "Fix misplaced return in RescueParty" into qt-dev am: a47236b5b6 (d0257a59) · Commits · e / os / android_frameworks_base

core/java/android/os/RecoverySystem.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -866,8 +866,8 @@ public class RecoverySystem {
	if (storageManager.needsCheckpoint()) {		if (storageManager.needsCheckpoint()) {
	Log.i(TAG, "Rescue Party requested wipe. Aborting update instead.");		Log.i(TAG, "Rescue Party requested wipe. Aborting update instead.");
	storageManager.abortChanges("rescueparty", false);		storageManager.abortChanges("rescueparty", false);
	}
	return;		return;
			}
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.i(TAG, "Failed to handle with checkpointing. Continuing with wipe.");		Log.i(TAG, "Failed to handle with checkpointing. Continuing with wipe.");
	}		}