commit 43cf00fe5850cbffec8f9af151de7d09eda3636b
author Daniel Xie <dxie@google.com> Fri Jun 19 21:08:24 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 19 21:08:24 2015 +0000
tree 2ce3add4ebe66e975e55143b3c7dc40e631b4882
parent 6929b7d70e451371cdcc9adc5b6bbab88456ab48
parent 209eff27552e1e185ea4bc19f066494e5c3d7ab5

am 209eff27: am abd0f1de: Merge "Increase polling timeout" into lollipop-mr1-cts-dev

* commit '209eff27552e1e185ea4bc19f066494e5c3d7ab5':
  Increase polling timeout

tests/tests/provider/src/android/provider/cts/CalendarTest.java

diff --git a/tests/tests/provider/src/android/provider/cts/CalendarTest.java b/tests/tests/provider/src/android/provider/cts/CalendarTest.java
index 2f5edd0..c9e2213 100644
--- a/tests/tests/provider/src/android/provider/cts/CalendarTest.java
+++ b/tests/tests/provider/src/android/provider/cts/CalendarTest.java
@@ -61,8 +61,8 @@
     // an arbitrary int used by some tests
     private static final int SOME_ARBITRARY_INT = 143234;
 
-    // 10 sec timeout for reminder broadcast (but shouldn't usually take this long).
-    private static final int POLLING_TIMEOUT = 10000;
+    // 15 sec timeout for reminder broadcast (but shouldn't usually take this long).
+    private static final int POLLING_TIMEOUT = 15000;
 
     // @formatter:off
     private static final String[] TIME_ZONES = new String[] {