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

Merge "[Settings] Remove null checking for TelephonyManager"

Browse Source
This commit is contained in:
Bonian Chen
2020-01-15 01:03:07 +00:00
committed by Android (Google) Code Review
parent 709e805e47 ec344c6031
commit a82788f554
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 =
mTelephonyManager.createForSubscriptionId(subId);
if (updatedTelephonyManager == null) {
return;
}
// restart monitoring when subscription has been changed
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.
*/
public static int getPhoneId(Context context, int subId) {
SubscriptionManager subManager = (SubscriptionManager)
context.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);
final SubscriptionManager subManager = context.getSystemService(SubscriptionManager.class);
if (subManager == null) {
return INVALID_SIM_SLOT_INDEX;
}
SubscriptionInfo info = subManager.getActiveSubscriptionInfo(subId);
final SubscriptionInfo info = subManager.getActiveSubscriptionInfo(subId);
if (info == null) {
return INVALID_SIM_SLOT_INDEX;
}