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

Commit be652502 authored by Hakjun Choi's avatar Hakjun Choi Committed by Android (Google) Code Review
Browse files

Merge "Clean up aconfig flag oem_enabled_satellite_flag" into main

parents fd57eb5b 3f5cf60c

src/com/android/settings/network/MobileNetworkRepository.java

+1 −3
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import androidx.annotation.GuardedBy; 
import androidx.annotation.NonNull;

import androidx.lifecycle.LifecycleOwner;



import com.android.internal.telephony.flags.Flags;

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

import com.android.settingslib.mobile.dataservice.MobileNetworkDatabase;
@@ -509,8 +508,7 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions 
                    }

                    if (subInfo.isEmbedded()

                        && (subInfo.getProfileClass() == PROFILE_CLASS_PROVISIONING

                            || (Flags.oemEnabledSatelliteFlag()

                            && subInfo.isOnlyNonTerrestrialNetwork()))) {

                            || subInfo.isOnlyNonTerrestrialNetwork())) {

                        if (DEBUG) {

                            Log.d(TAG, "Do not insert the provisioning or satellite eSIM");

                        }

src/com/android/settings/network/SubscriptionUtil.java

+1 −2
Original line number Diff line number Diff line
@@ -824,8 +824,7 @@ public class SubscriptionUtil { 
    private static boolean isEmbeddedSubscriptionVisible(@NonNull SubscriptionInfo subInfo) {

        if (subInfo.isEmbedded()

                && (subInfo.getProfileClass() == PROFILE_CLASS_PROVISIONING

                || (com.android.internal.telephony.flags.Flags.oemEnabledSatelliteFlag()

                && subInfo.isOnlyNonTerrestrialNetwork()))) {

                    || subInfo.isOnlyNonTerrestrialNetwork())) {

            return false;

        }

        return true;

src/com/android/settings/sim/CallsSimListDialogFragment.java

+1 −4
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ import android.telephony.SubscriptionInfo; 
import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;



import com.android.internal.telephony.flags.Flags;



import java.util.ArrayList;

import java.util.List;
@@ -59,8 +57,7 @@ public class CallsSimListDialogFragment extends SimListDialogFragment { 
            SubscriptionInfo info = subscriptionManager.getActiveSubscriptionInfo(subId);

            if (info == null || (info.isEmbedded()

                && (info.getProfileClass() == PROFILE_CLASS_PROVISIONING

                    || (Flags.oemEnabledSatelliteFlag()

                        && info.isOnlyNonTerrestrialNetwork())))) {

                    || info.isOnlyNonTerrestrialNetwork()))) {

                continue;

            }

            result.add(subscriptionManager.getActiveSubscriptionInfo(subId));

src/com/android/settings/sim/PreferredSimDialogFragment.java

+1 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import androidx.annotation.Nullable; 
import androidx.annotation.VisibleForTesting;

import androidx.appcompat.app.AlertDialog;



import com.android.internal.telephony.flags.Flags;

import com.android.settings.R;

import com.android.settings.network.SubscriptionUtil;
@@ -105,7 +104,7 @@ public class PreferredSimDialogFragment extends SimDialogFragment implements 
        final SubscriptionInfo info = getPreferredSubscription();

        if (info == null || (info.isEmbedded()

            && (info.getProfileClass() == PROFILE_CLASS_PROVISIONING

                || (Flags.oemEnabledSatelliteFlag() && info.isOnlyNonTerrestrialNetwork())))) {

                || info.isOnlyNonTerrestrialNetwork()))) {

            dismiss("SubscriptionInfo is null or other esim's cases.");

            return;

        }

src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java

+2 −5
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import androidx.annotation.Nullable; 
import androidx.annotation.VisibleForTesting;

import androidx.appcompat.app.AlertDialog;



import com.android.internal.telephony.flags.Flags;

import com.android.settings.R;

import com.android.settings.network.SubscriptionUtil;
@@ -137,12 +136,10 @@ public class SelectSpecificDataSimDialogFragment extends SimDialogFragment imple 


        if ((newSubInfo.isEmbedded()

            && (newSubInfo.getProfileClass() == PROFILE_CLASS_PROVISIONING

                || (Flags.oemEnabledSatelliteFlag()

                    && newSubInfo.isOnlyNonTerrestrialNetwork())))

                || newSubInfo.isOnlyNonTerrestrialNetwork()))

            || (currentDataSubInfo.isEmbedded()

            && (currentDataSubInfo.getProfileClass() == PROFILE_CLASS_PROVISIONING

                || (Flags.oemEnabledSatelliteFlag()

                    && currentDataSubInfo.isOnlyNonTerrestrialNetwork())))) {

                || currentDataSubInfo.isOnlyNonTerrestrialNetwork()))) {

            Log.d(TAG, "do not set the provisioning or satellite eSIM");

            dismiss();

            return;