Re-Add a flag to Enable Carrier N1 Mode Control

Add a new flag to control Carrier N1 Mode, so that
it can be defaulted to off. Some OEMs may not have
had sufficient opportunity to update all other
configs in all other software that must correctly
reflect the carrier SA mode support. In the event
that those configs are not updated, enabling this
feature will cause functional regressions. Thus,
disabling this feature by default.

Bug: 328848947
Test: atest GsmCdmaPhoneTest
Test: manually verified on Pixel
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:650660f91426d141a29fff2e9b55003d5e64ad3f)
Merged-In: Ic3d490422ea7973a21a59b5363232f8b8c06f872
Change-Id: Ic3d490422ea7973a21a59b5363232f8b8c06f872

1 files changed, 2 insertions, 2 deletions

diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
index de7ebd6514..4c7a3d3ffa 100644
--- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
+++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
@@ -2443,7 +2443,7 @@ public class GsmCdmaPhone extends Phone {
      */
     @Override
     public void setN1ModeEnabled(boolean enable, @Nullable Message result) {
-        if (mFeatureFlags.enableCarrierConfigN1Control()) {
+        if (mFeatureFlags.enableCarrierConfigN1ControlAttempt2()) {
             // This might be called by IMS on another thread, so to avoid the requirement to
             // lock, post it through the handler.
             post(() -> {
@@ -2484,7 +2484,7 @@ public class GsmCdmaPhone extends Phone {
 
     /** Only called on the handler thread. */
     private void updateCarrierN1ModeSupported(@NonNull PersistableBundle b) {
-        if (!mFeatureFlags.enableCarrierConfigN1Control()) return;
+        if (!mFeatureFlags.enableCarrierConfigN1ControlAttempt2()) return;
 
         if (!CarrierConfigManager.isConfigForIdentifiedCarrier(b)) return;