Merge cherrypicks of [4793640, 4793602, 4793603, 4793660, 4793604, 4793680, 4793681, 4793581, 4793582, 4793625, 4793626, 4793627, 4793628, 4793700, 4793701, 4793702, 4793703, 4793704, 4793705, 4793661, 4793720, 4793721, 4793722, 4793723, 4793724, 4793725, 4793726, 4793727, 4793728, 4793583, 4793740, 4793760, 4793662, 4793780, 4793729] into pi-release-2android-9.0.0_r18android-9.0.0_r10pie-release-2pie-r2-s2-release

Change-Id: I665794d270556b24de04163aad6fd27dc2fcc4a5

1 files changed, 0 insertions, 4 deletions

diff --git a/cryptfs.cpp b/cryptfs.cpp
index 2ab3d09b..c5024aeb 100644
--- a/cryptfs.cpp
+++ b/cryptfs.cpp
@@ -317,10 +317,6 @@ constexpr CryptoType default_crypto_type = CryptoType()
 
 constexpr CryptoType supported_crypto_types[] = {
     default_crypto_type,
-    CryptoType()
-        .set_property_name("Speck128/128-XTS")
-        .set_crypto_name("speck128-xts-plain64")
-        .set_keysize(32),
     // Add new CryptoTypes here.  Order is not important.
 };