commit cbc1bdba591589f37a0cad306ddafe4b3d7ad72a
author Howard Chen <howardsoc@google.com> Tue Sep 14 14:40:59 2021 +0800
committer Howard Chen <howardsoc@google.com> Wed Sep 15 01:59:59 2021 +0000
tree af674125217e3ec38e250e708ae9670f63c76273
parent 530329222f6dbba08e5ba7e7fada272912113227

Make the deleteAllKey feature aware of the DSU mode

Currently, the vold detects the factory reset by checking the
metadata encryption key. This logic is only valid when the
device is not in DSU mode.

Bug: 199222795
Test: run DSU installation on a Pixel device
Change-Id: Ib40bd44d2ef7c872eba177c9ccfefac8934a49e6

MetadataCrypt.cpp

diff --git a/MetadataCrypt.cpp b/MetadataCrypt.cpp
index 277a908..2f11c8b 100644
--- a/MetadataCrypt.cpp
+++ b/MetadataCrypt.cpp
@@ -113,7 +113,9 @@
     auto dir = metadata_key_dir + "/key";
     LOG(DEBUG) << "metadata_key_dir/key: " << dir;
     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(
                 "ro.crypto.metadata_init_delete_all_keys.enabled", false);
         if (delete_all) {