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

Add a condition for preventing NPE when accessing SatelliteManager

Browse Source 
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:
Hakjun Choi
2024-06-17 05:53:47 +00:00
parent 9bd19f4604
commit bdfd24ed5a
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/network/telephony/SatelliteSetting.java
View File

@@ -92,6 +92,14 @@ public class SatelliteSetting extends RestrictedDashboardFragment {
}
mActivity = getActivity();
mSatelliteManager = mActivity.getSystemService(SatelliteManager.class);
if (mSatelliteManager == null) {
Log.d(TAG, "SatelliteManager is null, do nothing.");
finish();
return;
}
mSubId = mActivity.getIntent().getIntExtra(SUB_ID,
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
@@ -104,7 +112,6 @@ public class SatelliteSetting extends RestrictedDashboardFragment {
}
mTelephonymanager = mActivity.getSystemService(TelephonyManager.class);
mSatelliteManager = mActivity.getSystemService(SatelliteManager.class);
}
@Override