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

Merge "Make RescueParty call vold directly" into qt-dev am: 2618371aa5

Browse Source 
am: 810274ed2d

Change-Id: Ibe6be230b5417cec8428516f6edbead1b0146976
This commit is contained in:
Daniel Rosenberg
2019-06-24 15:05:48 -07:00
committed by android-build-merger
parent 2fd1a1043b 810274ed2d
commit 2c8d9ec6d9
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/java/android/os/RecoverySystem.java
View File

@@ -30,7 +30,6 @@ import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.os.storage.IStorageManager;
import android.provider.Settings;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
@@ -41,8 +40,6 @@ import android.util.Log;
import android.view.Display;
import android.view.WindowManager;
import com.android.internal.content.PackageHelper;
import libcore.io.Streams;
import java.io.ByteArrayInputStream;
@@ -977,18 +974,31 @@ public class RecoverySystem {
public static void rebootPromptAndWipeUserData(Context context, String reason)
throws IOException {
boolean checkpointing = false;
boolean needReboot = false;
IVold vold = null;
try {
vold = IVold.Stub.asInterface(ServiceManager.checkService("vold"));
if (vold != null) {
checkpointing = vold.needsCheckpoint();
} else {
Log.w(TAG, "Failed to get vold");
}
} catch (Exception e) {
Log.w(TAG, "Failed to check for checkpointing");
}
// If we are running in checkpointing mode, we should not prompt a wipe.
// Checkpointing may save us. If it doesn't, we will wind up here again.
try {
IStorageManager storageManager = PackageHelper.getStorageManager();
if (storageManager.needsCheckpoint()) {
Log.i(TAG, "Rescue Party requested wipe. Aborting update instead.");
storageManager.abortChanges("rescueparty", false);
return;
if (checkpointing) {
try {
vold.abortChanges("rescueparty", false);
Log.i(TAG, "Rescue Party requested wipe. Aborting update");
} catch (Exception e) {
Log.i(TAG, "Rescue Party requested wipe. Rebooting instead.");
PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
pm.reboot("rescueparty");
}
} catch (RemoteException e) {
Log.i(TAG, "Failed to handle with checkpointing. Continuing with wipe.");
return;
}
String reasonArg = null;