From 7be1b5923f76e59ef2b0c30a8b53c8ba3942bfd3 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Tue, 4 Oct 2016 13:43:35 -0600 Subject: [PATCH] Give CTS the handle it expects to remove PIN. When the Direct Boot tests go to remove the PIN set in previous tests, it needs to find the option that will remove the PIN. Recent changes for fingerprint caused this "none" option to be hidden, so assign the "none" ID to the "skip" option. Test: cts-tradefed run cts-dev --module CtsAppSecurityHostTestCases --test android.appsecurity.cts.DirectBootHostTest Bug: 31160946 Change-Id: I0b34cbfae45d1db8ee58a5ef66738414f5e2fc27 --- src/com/android/settings/ChooseLockGeneric.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index ffc9abcfa54..3b592d48cb5 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -394,6 +394,7 @@ public class ChooseLockGeneric extends SettingsActivity { // Used for testing purposes findPreference(KEY_UNLOCK_SET_NONE).setViewId(R.id.lock_none); + findPreference(KEY_SKIP_FINGERPRINT).setViewId(R.id.lock_none); findPreference(KEY_UNLOCK_SET_PIN).setViewId(R.id.lock_pin); findPreference(KEY_UNLOCK_SET_PASSWORD).setViewId(R.id.lock_password); }