commit 7f328e65978635f1ba0359b7cfce9071d1f1b4b9
author Jeff Sharkey <jsharkey@android.com> Tue Oct 04 13:43:35 2016 -0600
committer gitbuildkicker <android-build@google.com> Tue Oct 04 16:48:51 2016 -0700
tree f53a5fa67680b7cddb66a98776060f8d837a0d08
parent 867deff02060793cbf38350f78ccf3069fc060f5

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
(cherry picked from commit 7be1b5923f76e59ef2b0c30a8b53c8ba3942bfd3)

src/com/android/settings/ChooseLockGeneric.java

diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index ffc9abc..3b592d4 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -394,6 +394,7 @@
 
             // 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);
         }