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

Add carrier satellite feature flag into filter out logic in Settings

Browse Source 
Null object reference exception happend when carrier satellite feature is disabled. whille filtering out satellite plmns from scanned plmns

Bug: 331182758
Test: atest NetworkSelectSettingsTest, manually test with feature enabled/disabled on pixel
Change-Id: I394e86ee9c26efdc9920006e0b8ca015500d5162
This commit is contained in:
Hakjun Choi
2024-03-26 16:56:10 +00:00
parent 8cc6c89e4b
commit 7a4d0284cc
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);
} }