Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev am:

90c818d am: fb0d651

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15536478

Change-Id: Ib8b347507793c00f6f2c585c7cadf4bdbdb0961c

Keymaster.cpp

@@ -230,18 +230,5 @@ void Keymaster::earlyBootEnded() {
     logKeystore2ExceptionIfPresent(rc, "earlyBootEnded");
 }
 
-void Keymaster::deleteAllKeys() {
-    ::ndk::SpAIBinder binder(AServiceManager_getService(maintenance_service_name));
-    auto maint_service = ks2_maint::IKeystoreMaintenance::fromBinder(binder);
-
-    if (!maint_service) {
-        LOG(ERROR) << "Unable to connect to keystore2 maintenance service for deleteAllKeys";
-        return;
-    }
-
-    auto rc = maint_service->deleteAllKeys();
-    logKeystore2ExceptionIfPresent(rc, "deleteAllKeys");
-}
-
 }  // namespace vold
 }  // namespace android

Keymaster.h

@@ -127,9 +127,6 @@ class Keymaster {
     // be created or used.
     static void earlyBootEnded();
 
-    // Tell all Keymint devices to delete all rollback-protected keys.
-    static void deleteAllKeys();
-
   private:
     std::shared_ptr<ks2::IKeystoreSecurityLevel> securityLevel;
     DISALLOW_COPY_AND_ASSIGN(Keymaster);

MetadataCrypt.cpp

@@ -112,17 +112,6 @@ static bool read_key(const std::string& metadata_key_dir, const KeyGeneration& g
     auto dir = metadata_key_dir + "/key";
     LOG(DEBUG) << "metadata_key_dir/key: " << dir;
     if (!MkdirsSync(dir, 0700)) return false;
-    if (!pathExists(dir)) {
-        auto delete_all = android::base::GetBoolProperty(
-                "ro.crypto.metadata_init_delete_all_keys.enabled", false);
-        if (delete_all) {
-            LOG(INFO) << "Metadata key does not exist, calling deleteAllKeys";
-            Keymaster::deleteAllKeys();
-        } else {
-            LOG(DEBUG) << "Metadata key does not exist but "
-                          "ro.crypto.metadata_init_delete_all_keys.enabled is false";
-        }
-    }
     auto temp = metadata_key_dir + "/tmp";
     return retrieveOrGenerateKey(dir, temp, kEmptyAuthentication, gen, key);
 }