commit 090fb0066593f9ad81394d941d5f572580c8624e
author Thomas Nguyen <tnd@google.com> Mon Sep 11 17:35:30 2023 -0700
committer Thomas Nguyen <tnd@google.com> Mon Sep 11 18:02:40 2023 -0700
tree 66e7aeb4f79320c137fed9660e7c449a7e284bee
parent 485de1f2f9e26b172429bfad0948106c44db72fe

Supply FeatureFlag when creating SatelliteController instance

Bug: 297943030
Test: SMS, MMS, call with live network.
atest android.telephony.satellite.cts.SatelliteManagerTestOnMockService
atest com.android.internal.telephony.satellite.SatelliteSessionControllerTest
atest com.android.internal.telephony.satellite.SatelliteControllerTest

Change-Id: I0b72df0b8225c2518fd5ff0050ad0074f7ace19c

src/com/android/phone/PhoneGlobals.java

diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index a6e2535..fffdac4 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -70,6 +70,7 @@
 import com.android.internal.telephony.data.DataEvaluation.DataDisallowedReason;
 import com.android.internal.telephony.domainselection.DomainSelectionResolver;
 import com.android.internal.telephony.emergency.EmergencyStateTracker;
+import com.android.internal.telephony.flags.FeatureFlags;
 import com.android.internal.telephony.flags.FeatureFlagsImpl;
 import com.android.internal.telephony.ims.ImsResolver;
 import com.android.internal.telephony.imsphone.ImsPhone;
@@ -479,7 +480,8 @@
                     getResources().getBoolean(R.bool.config_enable_aosp_domain_selection));
 
             // Initialize the telephony framework
-            PhoneFactory.makeDefaultPhones(this, new FeatureFlagsImpl());
+            FeatureFlags featureFlags = new FeatureFlagsImpl();
+            PhoneFactory.makeDefaultPhones(this, featureFlags);
 
             // Initialize the DomainSelectionResolver after creating the Phone instance
             // to check the Radio HAL version.
@@ -537,7 +539,7 @@
 
             // Create the SatelliteController singleton, which acts as a backend service for
             // {@link android.telephony.satellite.SatelliteManager}.
-            SatelliteController.make(this);
+            SatelliteController.make(this, featureFlags);
 
             // Create an instance of CdmaPhoneCallState and initialize it to IDLE
             cdmaPhoneCallState = new CdmaPhoneCallState();