Add a condition for preventing NPE when accessing SatelliteManager
There could be a case that FEATURE_TELEPHONY_SATELLITE is false but KEY_SATELLITE_ATTACH_SUPPORTED_BOOL it true
Since SatelliteManager can be returned only when FEATURE_TELEPHONY_SATELLITE is enabled, added a condition checks whether SatelliteManager is null or not
Bug: 347057183
Test: atest SatelliteManagerTest SatelliteManagerTestOnMockServiceTest
manually e2e test with FEATURE_TELEPHONY_SATELLITE disabled
Change-Id: I3f51e6805ccab3366d9d01be2e999818cd18354f
This commit is contained in:
@@ -64,6 +64,10 @@ public class SatelliteSettingPreferenceController extends
|
||||
return UNSUPPORTED_ON_DEVICE;
|
||||
}
|
||||
|
||||
if (mSatelliteManager == null) {
|
||||
return UNSUPPORTED_ON_DEVICE;
|
||||
}
|
||||
|
||||
final PersistableBundle carrierConfig = mCarrierConfigCache.getConfigForSubId(subId);
|
||||
final boolean isSatelliteAttachSupported = carrierConfig.getBoolean(
|
||||
CarrierConfigManager.KEY_SATELLITE_ATTACH_SUPPORTED_BOOL);
|
||||
|
||||
Reference in New Issue
Block a user