commit 617dbdb01e6caf14a299db03e88ae7f302f2bcd9
author Daniel Xie <dxie@google.com> Fri Aug 21 21:25:05 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 21 21:25:05 2015 +0000
tree 73426521fc7917f091b506f2af5e7a3d480fafeb
parent d12ba605217ffa497c5f2346a2441a781a2282f5
parent 31ade1dc4ca551dbd6ae97eaf5d92229cbc9026c

am 31ade1dc: am c3f7c316: Merge "Improve hitrate for ClonedSecureRandomTest" into lollipop-mr1-cts-dev

* commit '31ade1dc4ca551dbd6ae97eaf5d92229cbc9026c':
  Improve hitrate for ClonedSecureRandomTest

tests/tests/security/src/android/security/cts/ClonedSecureRandomTest.java

diff --git a/tests/tests/security/src/android/security/cts/ClonedSecureRandomTest.java b/tests/tests/security/src/android/security/cts/ClonedSecureRandomTest.java
index 8ebe6ac..dfefad7 100644
--- a/tests/tests/security/src/android/security/cts/ClonedSecureRandomTest.java
+++ b/tests/tests/security/src/android/security/cts/ClonedSecureRandomTest.java
@@ -120,6 +120,7 @@
          */
         int firstPid = -1;
         int previousPid = -1;
+        int lastPid = -1;
         for (int i = 0; i < MAX_PID; i++) {
             byte[] output = new byte[RANDOM_BYTES_PER_PID];
             int pid;
@@ -202,7 +203,9 @@
                 firstPid = pid;
             }
 
-            if (i > PRIMING_ITERATIONS) {
+            if (i <= PRIMING_ITERATIONS) {
+                lastPid = pid;
+            } else if (pid > lastPid && (lastPid > firstPid || pid < firstPid)) {
                 wastePids(firstPid, previousPid);
             }
         }