commit 2c237b45b8813b540a3e393d5a533861cbe9a5e6
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Nov 16 02:17:04 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Nov 16 02:17:04 2024 +0000
tree a5da73781942f27b92b8ddee74ab06cad7c510c9
parent f77ee86fc8e16b54d4872487242ab1b0612a3384
parent 9a802abf90011c22231aba70cc45b0298882c3bd

Snap for 12664851 from 9a802abf90011c22231aba70cc45b0298882c3bd to 25Q1-release

Change-Id: I43879208d84761c8debaf86e644a171d0f3583b0

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

diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertServiceTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertServiceTest.java
index 0c0fd4d..0826573 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertServiceTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertServiceTest.java
@@ -369,6 +369,9 @@
     }
 
     public void testShowNewAlertWithNotification() {
+        if (!SdkLevel.isAtLeastS()) {
+            return;
+        }
         doReturn("").when(mMockedSharedPreferences).getString(
                 eq("roaming_operator_supported"), any());
         doReturn(false).when(mResources).getBoolean(
@@ -403,6 +406,9 @@
     }
 
     public void testShowNewAlertWithNotificationInRoaming() {
+        if (!SdkLevel.isAtLeastS()) {
+            return;
+        }
         doReturn(false).when(mResources).getBoolean(
                 com.android.cellbroadcastreceiver.R.bool.show_alert_dialog_with_notification);
         doReturn("123456").when(mMockedSharedPreferences).getString(