Merge "Add a new field is_multi into Satellite atoms" into main
diff --git a/tests/src/com/android/phone/satellite/accesscontrol/SatelliteAccessControllerTest.java b/tests/src/com/android/phone/satellite/accesscontrol/SatelliteAccessControllerTest.java
index b4ae4b9..8df197c 100644
--- a/tests/src/com/android/phone/satellite/accesscontrol/SatelliteAccessControllerTest.java
+++ b/tests/src/com/android/phone/satellite/accesscontrol/SatelliteAccessControllerTest.java
@@ -126,6 +126,7 @@
import com.android.internal.telephony.satellite.SatelliteConfigParser;
import com.android.internal.telephony.satellite.SatelliteController;
import com.android.internal.telephony.satellite.SatelliteModemInterface;
+import com.android.internal.telephony.satellite.metrics.CarrierRoamingSatelliteControllerStats;
import com.android.internal.telephony.satellite.metrics.ControllerMetricsStats;
import com.android.internal.telephony.subscription.SubscriptionManagerService;
@@ -243,6 +244,8 @@
@Mock
private ConcurrentHashMap<IBinder, ISatelliteCommunicationAccessStateCallback>
mMockSatelliteCommunicationAccessStateChangedListeners;
+ @Mock
+ private CarrierRoamingSatelliteControllerStats mCarrierRoamingSatelliteControllerStats;
private SatelliteInfo mSatelliteInfo;
@@ -366,6 +369,8 @@
mMockCountryDetector);
replaceInstance(ControllerMetricsStats.class, "sInstance", null,
mock(ControllerMetricsStats.class));
+ replaceInstance(CarrierRoamingSatelliteControllerStats.class, "sInstance", null,
+ mCarrierRoamingSatelliteControllerStats);
when(mMockSatelliteController.getSatellitePhone()).thenReturn(mMockPhone);
when(mMockPhone.getSubId()).thenReturn(SubscriptionManager.getDefaultSubscriptionId());
@@ -444,6 +449,7 @@
mMockApplicationInfo.targetSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE;
when(mMockPackageManager.getApplicationInfo(anyString(), anyInt()))
.thenReturn(mMockApplicationInfo);
+ when(mCarrierRoamingSatelliteControllerStats.isMultiSim()).thenReturn(false);
mSatelliteInfo = new SatelliteInfo(
UUID.randomUUID(),