PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add carrier satellite feature flag into filter out logic in Settings" into 24D1-dev

Browse Source
This commit is contained in:
Hakjun Choi
2024-03-28 19:53:12 +00:00
committed by Android (Google) Code Review
parent b970322d4c 7a4d0284cc
commit e479584d52
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/network/telephony/NetworkSelectSettings.java
View File

@@ -46,6 +46,7 @@ import androidx.preference.PreferenceCategory;
import com.android.internal.annotations.Initializer; import com.android.internal.annotations.Initializer;
import com.android.internal.telephony.OperatorInfo; import com.android.internal.telephony.OperatorInfo;
import com.android.internal.telephony.flags.Flags;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
@@ -437,6 +438,9 @@ public class NetworkSelectSettings extends DashboardFragment {
*/ */
@VisibleForTesting @VisibleForTesting
protected List<String> getSatellitePlmnsForCarrierWrapper() { protected List<String> getSatellitePlmnsForCarrierWrapper() {
if (!Flags.carrierEnabledSatelliteFlag()) {
return new ArrayList<>();
}
return mSatelliteManager.getSatellitePlmnsForCarrier(mSubId); return mSatelliteManager.getSatellitePlmnsForCarrier(mSubId);
} }