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

Commit b35faf09 authored by Hakjun Choi's avatar Hakjun Choi
Browse files

Apply satellite feature flag to Settings activity 

Added carrier satellite condition to determine whether satellite settins menu should be exposed or not.
if carrier satellite feature is not enabled, satellite settings menu will not be shown

Bug: 327539253
Test: manual test with feature key disabled / enabled condition on pixel
Change-Id: I1abc84c2c47b48c0137274666da37bede10d2ae6
parent f0e052dc

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);