PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove CryptKeeperSettings

Browse Source 
FDE support has been removed in favor of FBE, so remove the FDE settings
from the "Encryption & credentials" page of the Settings app.

For now I didn't change the way the page appears on devices that don't
use FDE; as before, it still lists "Encrypt phone", followed by either
"Encrypted" or "Phone not encrypted" with no changeable settings.  Note
that the strings used for this have "crypt_keeper" in their names but
aren't specific to FDE; the next CL will rename them.

Test: On Cuttlefish with and without encryption enabled, tested visiting
      the "Encryption & credentials" settings.
Bug: 208476087
Change-Id: I3ce9894291ea1f1886f21980a86a92bfce38038a
This commit is contained in:
Eric Biggers
2022-01-11 17:01:22 -08:00
parent 43616ed3b6
commit 36609c18d1
16 changed files with 4 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java
View File

@@ -98,7 +98,7 @@ public class EncryptionStatusPreferenceControllerTest {
}
@Test
public void updateSummary_unencrypted_shouldHasEncryptionFragment() {
public void updateSummary_unencrypted_shouldSayUnencrypted() {
ShadowLockPatternUtils.setDeviceEncryptionEnabled(false);
mController.updateState(mPreference);
@@ -106,11 +106,11 @@ public class EncryptionStatusPreferenceControllerTest {
final CharSequence summary = mContext.getText(R.string.decryption_settings_summary);
assertThat(mPreference.getSummary()).isEqualTo(summary);
assertThat(mController.getPreferenceKey()).isNotEqualTo(PREF_KEY_ENCRYPTION_SECURITY_PAGE);
assertThat(mPreference.getFragment()).isEqualTo(CryptKeeperSettings.class.getName());
assertThat(mPreference.getFragment()).isNull();
}
@Test
public void updateSummary_unencrypted_securityPage_shouldNotHaveEncryptionFragment() {
public void updateSummary_unencrypted_securityPage_shouldSayUnencrypted() {
mController =
new EncryptionStatusPreferenceController(mContext,
PREF_KEY_ENCRYPTION_SECURITY_PAGE);
@@ -120,7 +120,6 @@ public class EncryptionStatusPreferenceControllerTest {
final CharSequence summary = mContext.getText(R.string.decryption_settings_summary);
assertThat(mPreference.getSummary()).isEqualTo(summary);
assertThat(mPreference.getFragment()).isNotEqualTo(CryptKeeperSettings.class.getName());
assertThat(mPreference.getFragment()).isNull();
}
}