Android/packages_apps_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 am: e479584d52

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26720047

Change-Id: Idd987b67733e17de46ec76001cf52bc0cf2bf5e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hakjun Choi
2024-03-28 20:14:30 +00:00
committed by Automerger Merge Worker
parent c35fc38be9 e479584d52
commit 748e0d5db9
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

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