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

[Settings] Remove null checking for TelephonyManager

Browse Source 
1. TelephonyManager#createForSubscriptionId(int) never returns null
   Remove null checking.
2. Adopting context#getSystemService(SubscriptionManager.class)

Bug: None
Test: make
Change-Id: Ie36dea80a4dfabbc34d9d25c50e60e4928b2f936
This commit is contained in:
Bonian Chen
2020-01-14 01:01:51 +08:00
parent 65b29905f7
commit ec344c6031
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/network/ApnSettings.java
View File

@@ -174,9 +174,6 @@ public class ApnSettings extends RestrictedSettingsFragment
final TelephonyManager updatedTelephonyManager = final TelephonyManager updatedTelephonyManager =
mTelephonyManager.createForSubscriptionId(subId); mTelephonyManager.createForSubscriptionId(subId);
if (updatedTelephonyManager == null) {
return;
}
// restart monitoring when subscription has been changed // restart monitoring when subscription has been changed
mTelephonyManager.listen(mPhoneStateListener, mTelephonyManager.listen(mPhoneStateListener,

5
src/com/android/settings/network/SubscriptionUtil.java
View File

@@ -278,12 +278,11 @@ public class SubscriptionUtil {
* Get phoneId or logical slot index for a subId if active, or INVALID_PHONE_INDEX if inactive. * Get phoneId or logical slot index for a subId if active, or INVALID_PHONE_INDEX if inactive.
*/ */
public static int getPhoneId(Context context, int subId) { public static int getPhoneId(Context context, int subId) {
SubscriptionManager subManager = (SubscriptionManager) final SubscriptionManager subManager = context.getSystemService(SubscriptionManager.class);
context.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);
if (subManager == null) { if (subManager == null) {
return INVALID_SIM_SLOT_INDEX; return INVALID_SIM_SLOT_INDEX;
} }
SubscriptionInfo info = subManager.getActiveSubscriptionInfo(subId); final SubscriptionInfo info = subManager.getActiveSubscriptionInfo(subId);
if (info == null) { if (info == null) {
return INVALID_SIM_SLOT_INDEX; return INVALID_SIM_SLOT_INDEX;
} }