Merge "Remove EncryptionInterstitial for Full Disk Encryption"

2022-12-16 18:55:41 +00:00
parent 13632ab0d0 5f1d894252
commit 4e337fe522
12 changed files with 20 additions and 648 deletions
--- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
@@ -252,17 +252,6 @@ public class ChooseLockGenericTest {
        assertThat(mActivity.isFinishing()).isFalse();
    }

-    @Test
-    public void onActivityResult_requestcode101_shouldFinish() {
-        initActivity(null);
-
-        mFragment.onActivityResult(
-                ChooseLockGenericFragment.ENABLE_ENCRYPTION_REQUEST, Activity.RESULT_OK,
-                null /* data */);
-
-        assertThat(mActivity.isFinishing()).isTrue();
-    }
-
    @Test
    public void onActivityResult_requestcode102_shouldFinish() {
        initActivity(null);