commit 5256669ce5328cb89e3e95c245e8c8e3af325543
author Hidehiko Abe <hidehiko@google.com> Tue Aug 16 13:47:18 2016 +0900
committer Stephen Li <stephenli@google.com> Thu Sep 15 14:34:55 2016 -0700
tree 4d8b01eef94e01a1344fe0717721d057086100ab
parent cc59c4759d84e10bf4695f7ccf370c2dba5b0b0f

Make "done" phase of ScreenPinningTestActivity reentrant.

In the original code, in mDone.run() moves the index
forward so it is not reentrant, unlike other
phases.
With this change, it is reentrant.

(cherry-picked from d39d155b818cc612b8ac73d550521b173c8e7375)

Change-Id: Iab03f4cc08a4025b111c402c74739cbd90f137bf

apps/CtsVerifier/src/com/android/cts/verifier/screenpinning/ScreenPinningTestActivity.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/screenpinning/ScreenPinningTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/screenpinning/ScreenPinningTestActivity.java
index 0728fb5..a6e5f98 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/screenpinning/ScreenPinningTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/screenpinning/ScreenPinningTestActivity.java
@@ -84,10 +84,6 @@
         } else {
             mTestIndex = 0;
         }
-        // Display any pre-existing text.
-        for (int i = 0; i < mTestIndex; i++) {
-            mTests[i].showText();
-        }
         mTests[mTestIndex].run();
     };
 
@@ -117,9 +113,6 @@
                 mTestIndex++;
                 if (mTestIndex < mTests.length) {
                     mTests[mTestIndex].run();
-                } else {
-                    mNextButton.setVisibility(View.GONE);
-                    findViewById(R.id.pass_button).setVisibility(View.VISIBLE);
                 }
             }
         });
@@ -222,9 +215,13 @@
     };
 
     private final Test mDone = new Test(R.string.screen_pinning_done) {
+        @Override
         protected void run() {
-            showText();
-            succeed();
+            super.run();
+            // On test completion, hide "next" button, and show "pass" button
+            // instead.
+            mNextButton.setVisibility(View.GONE);
+            findViewById(R.id.pass_button).setVisibility(View.VISIBLE);
         };
     };