Merge "Launch correct enrollment activity from ChooseLock" into qt-dev

2019-04-14 04:03:54 +00:00
parent ee35c1bddf 5ab064f343
commit 79f49b4626
6 changed files with 61 additions and 17 deletions
--- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
@@ -224,7 +224,7 @@ public class ChooseLockGenericTest {
        initActivity(null);

        mFragment.onActivityResult(
-                ChooseLockGenericFragment.CHOOSE_LOCK_BEFORE_FINGERPRINT_REQUEST,
+                ChooseLockGenericFragment.CHOOSE_LOCK_BEFORE_BIOMETRIC_REQUEST,
                BiometricEnrollBase.RESULT_FINISHED, null /* data */);

        assertThat(mActivity.isFinishing()).isTrue();