PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'android-11.0.0_r16' into android-10.0

Browse Source 
Android 11.0.0 release 16 - twrp bringup patch
This commit is contained in:
bigbiff
2020-12-02 19:44:56 -05:00
parent a9fc4f9eba d74a03d544
commit 673c7ae01e
250 changed files with 31359 additions and 4187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install/wipe_data.cpp
+10 -3
View File
@@ -27,10 +27,11 @@
#include <android-base/logging.h>
#include <android-base/stringprintf.h>
#include "install/snapshot_utils.h"
#include "otautil/dirutil.h"
#include "otautil/logging.h"
#include "otautil/roots.h"
#include "recovery_ui/ui.h"
#include "recovery_utils/logging.h"
#include "recovery_utils/roots.h"
constexpr const char* CACHE_ROOT = "/cache";
constexpr const char* DATA_ROOT = "/data";
@@ -104,6 +105,12 @@ bool WipeCache(const std::function<bool()>& confirm_func) {
bool WipeData(Device* device, bool convert_fbe) {
// RecoveryUI* ui = device->GetUI();
// ui->Print("\n-- Wiping data...\n");
// if (!FinishPendingSnapshotMerges(device)) {
// ui->Print("Unable to check update status or complete merge, cannot wipe partitions.\n");
// return false;
// }
bool success = device->PreWipeData();
if (success) {
success &= EraseVolume(DATA_ROOT, convert_fbe);
@@ -120,4 +127,4 @@ bool WipeData(Device* device, bool convert_fbe) {
}
// ui->Print("Data wipe %s.\n", success ? "complete" : "failed");
return success;
}
}