commit 3feeeb97a58f5dc48b42a6a83a2ae4d6ea3f30a6
author Jeff Sharkey <jsharkey@android.com> Tue Oct 04 13:56:51 2016 -0600
committer gitbuildkicker <android-build@google.com> Tue Oct 04 16:47:41 2016 -0700
tree 9d8c56e67bf0642ffc843e6ce429208da2d5ff76
parent 3b7b858154284e01d96d33a1195ebe1a212bba3f

Some fingerprint devices need double-confirmation.

A new flow was recently added for fingerprints, so we might need to
pick the "none" option twice in order to clear the PIN set by earlier
tests.

Test: cts-tradefed run cts-dev --module CtsAppSecurityHostTestCases --test android.appsecurity.cts.DirectBootHostTest
Bug: 31160946
Change-Id: I3c63cb687bc90653bf78802e0da7ebee7b2e907e
(cherry picked from commit 6dfd84af85ab105fdd2e6de515d6a6b4d58662bd)

hostsidetests/appsecurity/test-apps/EncryptionApp/src/com/android/cts/encryptionapp/EncryptionAppTest.java

diff --git a/hostsidetests/appsecurity/test-apps/EncryptionApp/src/com/android/cts/encryptionapp/EncryptionAppTest.java b/hostsidetests/appsecurity/test-apps/EncryptionApp/src/com/android/cts/encryptionapp/EncryptionAppTest.java
index 531511c..f00592f 100644
--- a/hostsidetests/appsecurity/test-apps/EncryptionApp/src/com/android/cts/encryptionapp/EncryptionAppTest.java
+++ b/hostsidetests/appsecurity/test-apps/EncryptionApp/src/com/android/cts/encryptionapp/EncryptionAppTest.java
@@ -161,6 +161,14 @@
         view.click();
         mDevice.waitForIdle();
 
+        // Yes, we really want "none" if prompted again
+        view = new UiObject(new UiSelector()
+                .resourceId("com.android.settings:id/lock_none"));
+        if (view.waitForExists(TIMEOUT)) {
+            view.click();
+            mDevice.waitForIdle();
+        }
+
         // Yes, we really want to
         view = new UiObject(new UiSelector()
                 .resourceId("android:id/button1"));