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

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

Merge "Apply satellite feature flag to Settings activity" into main

parents 975e7616 b35faf09

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

+6 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import androidx.annotation.Nullable; 
import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;



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

import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.network.CarrierConfigCache;
@@ -58,6 +59,11 @@ public class SatelliteSettingPreferenceController extends 


    @Override

    public int getAvailabilityStatus(int subId) {

        if (!Flags.carrierEnabledSatelliteFlag()) {

            logd("getAvailabilityStatus() : carrierEnabledSatelliteFlag is disabled");

            return UNSUPPORTED_ON_DEVICE;

        }



        final PersistableBundle carrierConfig = mCarrierConfigCache.getConfigForSubId(subId);

        final boolean isSatelliteAttachSupported = carrierConfig.getBoolean(

                CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL);