From b21d2216ac3c9184b982f3ce246381ecccd2fcc3 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Thu, 10 Mar 2022 21:50:30 +0000 Subject: [PATCH] Remove support for converting from FDE to FBE Devices that launched with Android 10 or later require FBE (File Based Encryption) from the beginning, so there's no need to support converting to FBE after the fact anymore. This was only ever a developer option, so it probably wasn't used much. And in any case, it's not used anymore, as isConvertibleToFBE() is hard-coded to return false. Besides the fact that FBE has been required for several releases now, this functionality was only ever available on devices that use FDE (Full Disk Encryption), but FDE support has been removed from Android. Therefore, remove this unused code. Bug: 208476087 Change-Id: Ia765d6827e6144153c4e2a253b146ef2c75ca6fe --- res/layout/confirm_convert_fbe.xml | 46 ------- res/layout/convert_fbe.xml | 46 ------- res/values/strings.xml | 5 - res/xml/development_settings.xml | 6 - .../applications/ConfirmConvertToFbe.java | 55 --------- .../settings/applications/ConvertToFbe.java | 97 --------------- .../DevelopmentSettingsDashboardFragment.java | 1 - .../FileEncryptionPreferenceController.java | 85 ------------- .../exempt_not_implementing_index_provider | 1 - ...ileEncryptionPreferenceControllerTest.java | 116 ------------------ 10 files changed, 458 deletions(-) delete mode 100644 res/layout/confirm_convert_fbe.xml delete mode 100644 res/layout/convert_fbe.xml delete mode 100644 src/com/android/settings/applications/ConfirmConvertToFbe.java delete mode 100644 src/com/android/settings/applications/ConvertToFbe.java delete mode 100644 src/com/android/settings/development/FileEncryptionPreferenceController.java delete mode 100644 tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java diff --git a/res/layout/confirm_convert_fbe.xml b/res/layout/confirm_convert_fbe.xml deleted file mode 100644 index 537c3680ba6..00000000000 --- a/res/layout/confirm_convert_fbe.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - -