tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Make the deleteAllKey feature aware of the DSU mode" am: d718c8c577 am: 9c2577b823

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1826054

Change-Id: I5236ae0e54e9c95576f1b4b2ac58544d3a0468f0
This commit is contained in:
Howard Chen 2021-09-22 04:36:51 +00:00 committed by Automerger Merge Worker
commit fc8d1c7d37
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
MetadataCrypt.cpp
View file

@ -113,7 +113,9 @@ static bool read_key(const std::string& metadata_key_dir, const KeyGeneration& g
auto dir = metadata_key_dir + "/key"; auto dir = metadata_key_dir + "/key";
LOG(DEBUG) << "metadata_key_dir/key: " << dir; LOG(DEBUG) << "metadata_key_dir/key: " << dir;
if (!MkdirsSync(dir, 0700)) return false; if (!MkdirsSync(dir, 0700)) return false;
if (!pathExists(dir)) { auto in_dsu = android::base::GetBoolProperty("ro.gsid.image_running", false);
// !pathExists(dir) does not imply there's a factory reset when in DSU mode.
if (!pathExists(dir) && !in_dsu) {
auto delete_all = android::base::GetBoolProperty( auto delete_all = android::base::GetBoolProperty(
"ro.crypto.metadata_init_delete_all_keys.enabled", false); "ro.crypto.metadata_init_delete_all_keys.enabled", false);
if (delete_all) { if (delete_all) {