diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-09-27 23:38:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-09-27 23:38:02 +0000 |
| commit | 41f0c1b5eb50b95125ba9b0319698b2377560013 (patch) | |
| tree | 7a2ba1dc660a7b36b3283d8ad42e4d1b0580eceb | |
| parent | d08dae25b765edf97ff0b388e69d7f7dfe5be785 (diff) | |
| parent | ad39bfdf832f6e0e92a6cd25518a1c4b0a7918c3 (diff) | |
| download | cts-41f0c1b5eb50b95125ba9b0319698b2377560013.tar.gz | |
Merge "Fix array out of bounds access in FileObserverTest" into pie-cts-dev
| -rw-r--r-- | tests/tests/os/src/android/os/cts/FileObserverTest.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/tests/os/src/android/os/cts/FileObserverTest.java b/tests/tests/os/src/android/os/cts/FileObserverTest.java index 744963e1759..287df074ec1 100644 --- a/tests/tests/os/src/android/os/cts/FileObserverTest.java +++ b/tests/tests/os/src/android/os/cts/FileObserverTest.java @@ -242,11 +242,8 @@ public class FileObserverTest extends AndroidTestCase { String message = "Expected to contain: " + expectedEvents + " Actual: " + actualEvents; int j = 0; for (int i = 0; i < expected.length; i++) { - while (expected[i] != moveEvents[j].event) { - j++; - if (j >= moveEvents.length) - fail(message); - } + while (j < moveEvents.length && expected[i] != moveEvents[j].event) j++; + if (j >= moveEvents.length) fail(message); j++; } } |