commit 4f30aa2be8d15d765d5925a6cda6cc7bc84c8758
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 09 23:17:13 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 09 23:17:18 2017 +0000
tree 97b35bce5f612f27cbf1d3e9c3c586e1c867a689
parent 0aaae4ae78fc85aef5346350b26505b434271d1c
parent f26517d46617cb8b8d3ea5a7559bbcb7df31a526

Merge "Removed test from presubmit." into oc-dev

packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java

diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java
index 97d9080..b054690 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java
@@ -24,10 +24,10 @@
 import static org.mockito.Mockito.when;
 
 import android.app.Instrumentation;
-import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
 import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.FlakyTest;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 
@@ -79,6 +79,7 @@
         });
     }
 
+    @FlakyTest
     @Test
     public void testOnNotification_stillWorksAfterOneFailedProxCheck() throws Exception {
         when(mMachine.getState()).thenReturn(DozeMachine.State.DOZE);