summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jorim Jaggi <jjaggi@google.com> 2019-04-11 13:09:53 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-04-11 13:09:53 +0000
commit38ae4d1a9249b4fd37b9165773bdc238523cde4c (patch)
tree2a6226eb15572fc94bbe778bb6ffd4ccb4398466
parentbf72ee109bb8878ef967a06e3a63ef0f448648b4 (diff)
parentb9a724b0d4ed5aed825a906944bdc1c50f4b1206 (diff)
Merge "Mark testEarliestAlarmSet as flaky" into qt-dev
-rw-r--r--services/tests/mockingservicestests/src/com/android/server/AlarmManagerServiceTest.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/tests/mockingservicestests/src/com/android/server/AlarmManagerServiceTest.java b/services/tests/mockingservicestests/src/com/android/server/AlarmManagerServiceTest.java
index 7a68e92cff6d..c0a11b27c65c 100644
--- a/services/tests/mockingservicestests/src/com/android/server/AlarmManagerServiceTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/AlarmManagerServiceTest.java
@@ -78,6 +78,7 @@ import android.provider.Settings;
import android.util.Log;
import android.util.SparseArray;
+import androidx.test.filters.FlakyTest;
import androidx.test.runner.AndroidJUnit4;
import com.android.internal.annotations.GuardedBy;
@@ -403,6 +404,7 @@ public class AlarmManagerServiceTest {
assertEquals(expectedTriggerTime, mTestTimer.getElapsed());
}
+ @FlakyTest(bugId = 130313408)
@Test
public void testEarliestAlarmSet() {
final PendingIntent pi6 = getNewMockPendingIntent();