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

[Settings] Add NPE protection

Browse Source 
Bug: 257197354
Test: manual
Change-Id: Icd944feac79acb9cfdefb4f82fe1183b0a0e3218
This commit is contained in:
Zoey Chen
2022-11-18 04:16:05 +00:00
parent 47c0ee6b38
commit 469b708a2a
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/telephony/AutoDataSwitchPreferenceController.java
View File

@@ -99,7 +99,7 @@ public class AutoDataSwitchPreferenceController extends TelephonyTogglePreferenc
@Override @Override
public boolean isChecked() { public boolean isChecked() {
return mManager.isMobileDataPolicyEnabled( return mManager != null && mManager.isMobileDataPolicyEnabled(
TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH); TelephonyManager.MOBILE_DATA_POLICY_AUTO_DATA_SWITCH);
} }

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

@@ -135,6 +135,11 @@ public class EnabledNetworkModePreferenceController extends
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
super.updateState(preference); super.updateState(preference);
if (mBuilder == null) {
return;
}
final ListPreference listPreference = (ListPreference) preference; final ListPreference listPreference = (ListPreference) preference;
mBuilder.setPreferenceEntries(); mBuilder.setPreferenceEntries();
@@ -871,6 +876,8 @@ public class EnabledNetworkModePreferenceController extends
@Override @Override
public void onSubscriptionsChanged() { public void onSubscriptionsChanged() {
mBuilder.updateConfig(); if (mBuilder != null) {
mBuilder.updateConfig();
}
} }
} }

3
src/com/android/settings/network/telephony/MmsMessagePreferenceController.java
View File

@@ -96,7 +96,8 @@ public class MmsMessagePreferenceController extends TelephonyTogglePreferenceCon
@Override @Override
public boolean isChecked() { public boolean isChecked() {
return mTelephonyManager.isDataEnabledForApn(ApnSetting.TYPE_MMS); return mTelephonyManager != null && mTelephonyManager.isDataEnabledForApn(
ApnSetting.TYPE_MMS);
} }
private void refreshPreference() { private void refreshPreference() {

14
src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.network.telephony.cdma;
import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA; import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA;
import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA; import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA;
import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_UNKNOWN;
import android.content.Context; import android.content.Context;
import android.provider.Settings; import android.provider.Settings;
@@ -43,7 +44,10 @@ public class CdmaSystemSelectPreferenceController extends CdmaBasePreferenceCont
super.updateState(preference); super.updateState(preference);
final ListPreference listPreference = (ListPreference) preference; final ListPreference listPreference = (ListPreference) preference;
listPreference.setVisible(getAvailabilityStatus() == AVAILABLE); listPreference.setVisible(getAvailabilityStatus() == AVAILABLE);
final int mode = mTelephonyManager.getCdmaRoamingMode(); boolean hasTelephonyMgr = mTelephonyManager != null;
final int mode =
hasTelephonyMgr ? mTelephonyManager.getCdmaRoamingMode()
: TelephonyManager.CDMA_ROAMING_MODE_RADIO_DEFAULT;
if (mode != TelephonyManager.CDMA_ROAMING_MODE_RADIO_DEFAULT) { if (mode != TelephonyManager.CDMA_ROAMING_MODE_RADIO_DEFAULT) {
if (mode == TelephonyManager.CDMA_ROAMING_MODE_HOME if (mode == TelephonyManager.CDMA_ROAMING_MODE_HOME
|| mode == TelephonyManager.CDMA_ROAMING_MODE_ANY) { || mode == TelephonyManager.CDMA_ROAMING_MODE_ANY) {
@@ -53,9 +57,11 @@ public class CdmaSystemSelectPreferenceController extends CdmaBasePreferenceCont
} }
} }
final int settingsNetworkMode = MobileNetworkUtils.getNetworkTypeFromRaf( final int settingsNetworkMode =
(int) mTelephonyManager.getAllowedNetworkTypesForReason( hasTelephonyMgr ? MobileNetworkUtils.getNetworkTypeFromRaf(
TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER)); (int) mTelephonyManager.getAllowedNetworkTypesForReason(
TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER))
: NETWORK_MODE_UNKNOWN;
final boolean enableList = settingsNetworkMode != NETWORK_MODE_LTE_GSM_WCDMA final boolean enableList = settingsNetworkMode != NETWORK_MODE_LTE_GSM_WCDMA
&& settingsNetworkMode != NETWORK_MODE_NR_LTE_GSM_WCDMA; && settingsNetworkMode != NETWORK_MODE_NR_LTE_GSM_WCDMA;
listPreference.setEnabled(enableList); listPreference.setEnabled(enableList);