From e380b4cff07af76eded359d1d5345f982de38e16 Mon Sep 17 00:00:00 2001
From: Pavel Grafov <pgrafov@google.com>
Date: Wed, 5 Feb 2020 18:42:15 +0000
Subject: [PATCH] Mark tests as flaky to exclude from presubmit.

Bug: 148934649
Test: compiles
Change-Id: Ifc85a06fdea35bc13096f38da6564e5590a05e8f
---
 .../android/server/devicepolicy/DevicePolicyManagerTest.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
index e0c6d6a36d0c8..7d5cb135a15b8 100644
--- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
@@ -96,6 +96,7 @@ import android.test.MoreAsserts;
 import android.util.ArraySet;
 import android.util.Pair;
 
+import androidx.test.filters.FlakyTest;
 import androidx.test.filters.SmallTest;
 
 import com.android.internal.R;
@@ -5446,6 +5447,7 @@ public class DevicePolicyManagerTest extends DpmTestBase {
         assertTrue(dpms.isAdminActive(admin1, UserHandle.USER_SYSTEM));
     }
 
+    @FlakyTest(bugId = 148934649)
     public void testRevertDeviceOwnership_adminAndDeviceMigrated() throws Exception {
         DpmTestUtils.writeInputStreamToFile(
                 getRawStream(com.android.frameworks.servicestests.R.raw.active_admin_migrated),
@@ -5456,6 +5458,7 @@ public class DevicePolicyManagerTest extends DpmTestBase {
         assertDeviceOwnershipRevertedWithFakeTransferMetadata();
     }
 
+    @FlakyTest(bugId = 148934649)
     public void testRevertDeviceOwnership_deviceNotMigrated()
             throws Exception {
         DpmTestUtils.writeInputStreamToFile(
@@ -5487,6 +5490,7 @@ public class DevicePolicyManagerTest extends DpmTestBase {
         UserHandle userHandle = UserHandle.of(DpmMockContext.CALLER_USER_HANDLE);
     }
 
+    @FlakyTest(bugId = 148934649)
     public void testRevertProfileOwnership_adminAndProfileMigrated() throws Exception {
         getServices().addUser(DpmMockContext.CALLER_USER_HANDLE, 0,
                 UserManager.USER_TYPE_PROFILE_MANAGED, UserHandle.USER_SYSTEM);
@@ -5499,6 +5503,7 @@ public class DevicePolicyManagerTest extends DpmTestBase {
         assertProfileOwnershipRevertedWithFakeTransferMetadata();
     }
 
+    @FlakyTest(bugId = 148934649)
     public void testRevertProfileOwnership_profileNotMigrated() throws Exception {
         getServices().addUser(DpmMockContext.CALLER_USER_HANDLE, 0,
                 UserManager.USER_TYPE_PROFILE_MANAGED, UserHandle.USER_SYSTEM);