Merge "Ignore Flaky test until the final solution available"
diff --git a/packages/SystemUI/tests/src/com/android/systemui/onehanded/OneHandedDisplayAreaOrganizerTest.java b/packages/SystemUI/tests/src/com/android/systemui/onehanded/OneHandedDisplayAreaOrganizerTest.java
index 7cf351f..84a261b6 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/onehanded/OneHandedDisplayAreaOrganizerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/onehanded/OneHandedDisplayAreaOrganizerTest.java
@@ -44,6 +44,7 @@
 import com.android.systemui.wm.DisplayController;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -135,6 +136,7 @@
         assertThat(mDisplayAreaOrganizer.mDisplayAreaMap.containsKey(mDisplayAreaInfo)).isTrue();
     }
 
+    @Ignore("b/160848002")
     @Test
     public void testScheduleOffset() {
         final int xOffSet = 0;
@@ -148,6 +150,7 @@
                 OneHandedDisplayAreaOrganizer.MSG_OFFSET_ANIMATE)).isEqualTo(true);
     }
 
+    @Ignore("b/160848002")
     @Test
     public void testRotation_portraitToLandscape() {
         when(mMockLeash.isValid()).thenReturn(false);
@@ -180,6 +183,7 @@
                 OneHandedDisplayAreaOrganizer.MSG_RESET_IMMEDIATE)).isEqualTo(true);
     }
 
+    @Ignore("b/160848002")
     @Test
     public void testRotation_landscapeToPortrait() {
         when(mMockLeash.isValid()).thenReturn(false);
@@ -212,6 +216,7 @@
                 OneHandedDisplayAreaOrganizer.MSG_RESET_IMMEDIATE)).isEqualTo(true);
     }
 
+    @Ignore("b/160848002")
     @Test
     public void testRotation_portraitToPortrait() {
         when(mMockLeash.isValid()).thenReturn(false);
@@ -244,6 +249,7 @@
                 OneHandedDisplayAreaOrganizer.MSG_RESET_IMMEDIATE)).isEqualTo(false);
     }
 
+    @Ignore("b/160848002")
     @Test
     public void testRotation_landscapeToLandscape() {
         when(mMockLeash.isValid()).thenReturn(false);