| commit | 748e0d5db95e6d11288ce5eb6293b0fac4eee184 | [log] [tgz] |
|---|---|---|
| author | Hakjun Choi <hakjunc@google.com> | Thu Mar 28 20:14:30 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 28 20:14:30 2024 +0000 |
| tree | 824ffdb4f6c00b69ccfb2934175536ee501986ec | |
| parent | c35fc38be96909d17350b5e3c60df7d760508f9c [diff] | |
| parent | e479584d52bb19d97d0c7945c35ea33abecf4632 [diff] |
Merge "Add carrier satellite feature flag into filter out logic in Settings" into 24D1-dev am: e479584d52 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>
diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java index 19bc390..0188166 100644 --- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java +++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -44,6 +44,7 @@ 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 @@ */ @VisibleForTesting protected List<String> getSatellitePlmnsForCarrierWrapper() { + if (!Flags.carrierEnabledSatelliteFlag()) { + return new ArrayList<>(); + } return mSatelliteManager.getSatellitePlmnsForCarrier(mSubId); }