commit ff52559655957ce49ffacdfcc0111059c4a2e56e
author Barani Muthukumaran <bmuthuku@codeaurora.org> Wed Jan 29 14:38:31 2020 -0800
committer Barani Muthukumaran <bmuthuku@codeaurora.org> Wed Jan 29 14:38:31 2020 -0800
tree a756dd8de26d736c9b7e896f986604f4f1b6218d
parent b0e0030565b09acdc7fc3bbcc438169b58fa7d56

Revert "system: vold: Use ICE for UFS card"

This reverts commit 38cbb94341fb03d556477468457cee0848437a82.

CRs-Fixed: 2609414

Change-Id: Ib282a50d6d5a6737f5d6e3cfb8f2efb6e7b32e3a

FsCrypt.cpp

diff --git a/FsCrypt.cpp b/FsCrypt.cpp
index 0d4f02e..183878a 100644
--- a/FsCrypt.cpp
+++ b/FsCrypt.cpp
@@ -21,7 +21,6 @@
 #include "KeyUtil.h"
 #include "Utils.h"
 #include "VoldUtil.h"
-#include "model/Disk.h"
 
 #include <algorithm>
 #include <map>
@@ -222,8 +221,7 @@
 // Retrieve the options to use for encryption policies on adoptable storage.
 static bool get_volume_file_encryption_options(EncryptionOptions* options, int flags) {
     auto contents_mode =
-            android::base::GetProperty("ro.crypto.volume.contents_mode",
-                                       is_ice_supported_external(flags) ? "ice" : "aes-256-xts");
+            android::base::GetProperty("ro.crypto.volume.contents_mode", "aes-256-xts");
     auto filenames_mode =
             android::base::GetProperty("ro.crypto.volume.filenames_mode", "aes-256-heh");
     return ParseOptions(android::base::GetProperty("ro.crypto.volume.options",
@@ -241,24 +239,11 @@
     return android::vold::evictKey(DATA_MNT_POINT, raw_ref, get_data_file_policy_version());
 }
 
-bool is_ice_supported_external(int flags) {
-    /*
-     * Logic can be changed when more card controllers start supporting ICE.
-     * Until then, checking only for UFS card.
-     */
-    if ((flags & android::vold::Disk::Flags::kUfsCard) ==
-                           android::vold::Disk::Flags::kUfsCard)
-        return true;
-    return false;
-}
-
 bool is_wrapped_key_supported() {
     return GetEntryForMountPoint(&fstab_default, DATA_MNT_POINT)->fs_mgr_flags.wrapped_key;
 }
 
-bool is_wrapped_key_supported_external(int flags) {
-    if (is_ice_supported_external(flags))
-        return GetEntryForMountPoint(&fstab_default, DATA_MNT_POINT)->fs_mgr_flags.wrapped_key;
+static bool is_wrapped_key_supported_external() {
     return false;
 }
 
@@ -676,7 +661,7 @@
     android::vold::KeyAuthentication auth("", secdiscardable_hash);
 
     if (!get_volume_file_encryption_options(&policy->options, flags)) return false;
-    wrapped_key_supported = is_wrapped_key_supported_external(flags);
+    wrapped_key_supported = is_wrapped_key_supported_external();
 
     return android::vold::retrieveAndInstallKey(true, auth, key_path, key_path + "_tmp",
                                                 volume_uuid, policy->options.version,