Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1d9f078 authored by tom hsu's avatar tom hsu
Browse files

[Settings] Remove flag Satellite_Oem_Settings_Ux_Migration 

Flag: EXEMPT remove flag
Fix: b/409605478
Test: atest pass
Change-Id: I2d0b89a93e0610546f468f1d500e146cb22ef4fe
parent 6e9a211d

aconfig/settings_experience_flag_declarations.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -10,14 +10,3 @@ flag { 
        purpose: PURPOSE_BUGFIX

    }

}
 


flag {

    name: "satellite_oem_settings_ux_migration"

    namespace: "settings_experience"

    description: "Migrate satellite UX to Android Settings"

    bug: "378781925"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}

src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java

+16 −20
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ public class EnabledNetworkModePreferenceController extends 


    @Override

    public void onStart(@NonNull LifecycleOwner owner) {

        if (com.android.settings.flags.Flags.satelliteOemSettingsUxMigration()) {

        if (mSatelliteManager != null) {

            try {

                mSatelliteManager.registerForModemStateChanged(
@@ -154,7 +153,6 @@ public class EnabledNetworkModePreferenceController extends 
                Log.w(LOG_TAG, "IllegalStateException : " + e);

            }

        }

        }



        mSubscriptionsListener.start();

        if (mAllowedNetworkTypesListener == null || mTelephonyCallback == null) {
@@ -167,7 +165,6 @@ public class EnabledNetworkModePreferenceController extends 
    @Override

    public void onStop(@NonNull LifecycleOwner owner) {

        mSubscriptionsListener.stop();

        if (com.android.settings.flags.Flags.satelliteOemSettingsUxMigration()) {

        if (mSatelliteManager != null) {

            try {

                mSatelliteManager.unregisterForModemStateChanged(mSatelliteModemStateCallback);
@@ -177,7 +174,6 @@ public class EnabledNetworkModePreferenceController extends 
                Log.w(LOG_TAG, "IllegalStateException : " + e);

            }

        }

        }



        if (mAllowedNetworkTypesListener == null || mTelephonyCallback == null) {

            return;

src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java

+16 −20
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ public class PreferredNetworkModePreferenceController extends BasePreferenceCont 


    @Override

    public void onStart(@NonNull LifecycleOwner owner) {

        if (com.android.settings.flags.Flags.satelliteOemSettingsUxMigration()) {

        if (mSatelliteManager != null) {

            try {

                mSatelliteManager.registerForModemStateChanged(
@@ -162,11 +161,9 @@ public class PreferredNetworkModePreferenceController extends BasePreferenceCont 
            }

        }

    }

    }



    @Override

    public void onStop(@NonNull LifecycleOwner owner) {

        if (com.android.settings.flags.Flags.satelliteOemSettingsUxMigration()) {

        if (mSatelliteManager != null) {

            try {

                mSatelliteManager.unregisterForModemStateChanged(mSatelliteModemStateCallback);
@@ -177,7 +174,6 @@ public class PreferredNetworkModePreferenceController extends BasePreferenceCont 
            }

        }

    }

    }



    private int getPreferredNetworkMode() {

        if (mTelephonyManager == null) {

src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.kt

+19 −23
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import androidx.lifecycle.LifecycleOwner 
import androidx.lifecycle.compose.collectAsStateWithLifecycle

import com.android.settings.R

import com.android.settings.Settings.NetworkSelectActivity

import com.android.settings.flags.Flags

import com.android.settings.network.CarrierConfigCache

import com.android.settings.network.telephony.MobileNetworkUtils

import com.android.settings.network.telephony.allowedNetworkTypesFlow
@@ -158,7 +157,6 @@ class AutoSelectPreferenceController @JvmOverloads constructor( 
    }



    override fun onStart(owner: LifecycleOwner) {

        if (Flags.satelliteOemSettingsUxMigration()) {

        if (satelliteManager != null) {

            try {

                satelliteManager.registerForModemStateChanged(
@@ -171,11 +169,10 @@ class AutoSelectPreferenceController @JvmOverloads constructor( 
                Log.w(TAG, "IllegalStateException $e")

            }

        }

        }



    }



    override fun onStop(owner: LifecycleOwner) {

        if (Flags.satelliteOemSettingsUxMigration()) {

        if (satelliteManager != null) {

            try {

                satelliteManager.unregisterForModemStateChanged(satelliteModemStateCallback)
@@ -187,7 +184,6 @@ class AutoSelectPreferenceController @JvmOverloads constructor( 
            }

        }

    }

    }



    private suspend fun getDisallowedSummary(serviceState: ServiceState): String =

        withContext(Dispatchers.Default) {

src/com/android/settings/network/telephony/satellite/SatelliteSettingAccountInfoController.java

+7 −8
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ public class SatelliteSettingAccountInfoController extends TelephonyBasePreferen 
        /* In case satellite is allowed by carrier's entitlement server, the page will show

               the check icon with guidance that satellite is included in user's mobile plan */

        messagingPreference.setTitle(R.string.title_have_satellite_plan);

        if (com.android.settings.flags.Flags.satelliteOemSettingsUxMigration()) {

        if (mIsDataAvailable) {

            Preference connectivityPreference = mScreen.findPreference(

                    PREF_KEY_YOUR_SATELLITE_DATA_PLAN);
@@ -135,7 +134,7 @@ public class SatelliteSettingAccountInfoController extends TelephonyBasePreferen 
            connectivityPreference.setIcon(icon);

            connectivityPreference.setVisible(true);

        }

        }



        icon.setTintList(Utils.getColorAttr(mContext, android.R.attr.textColorPrimary));

        messagingPreference.setIcon(icon);

    }