commit e867f9e3dd434ffe064b37ab7cd2108617071154
author Nazanin Bakhshi <nazaninb@google.com> Thu Oct 22 02:03:47 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 22 02:03:47 2020 +0000
tree 57d814a404ba69605cffeed247cd579824569647
parent 869e6d4ca3fdb62043715371ad1652bc172b7b1b
parent e1564ff2e153122a220087644b9296fdf5a51936

Merge "Marking CellBroadcastBootupConfigTest#testConfiguration as FlakyTest instead of Ignore."

tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastBootupConfigTest.java

diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastBootupConfigTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastBootupConfigTest.java
index 8c8d826..f550a07 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastBootupConfigTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastBootupConfigTest.java
@@ -46,6 +46,8 @@
 import android.os.IBinder;
 import android.telephony.SmsCbMessage;
 
+import androidx.test.filters.FlakyTest;
+
 import com.android.cellbroadcastreceiver.CellBroadcastConfigService;
 import com.android.cellbroadcastreceiver.CellBroadcastSettings;
 import com.android.internal.telephony.ISms;
@@ -133,6 +135,8 @@
     }
 
     // Test if CellbroadcastConfigService properly configure all the required channels.
+
+    @FlakyTest
     public void testConfiguration() throws Exception {
         String[] preferenceKeys = {
                 CellBroadcastSettings.KEY_ENABLE_ALERTS_MASTER_TOGGLE,