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

Merge "Add null checker for telephonymanager" into main

Browse Source
This commit is contained in:
SongFerng Wang
2025-02-25 02:14:42 -08:00
committed by Android (Google) Code Review
parent 4cbc560d1d e4c2cddfae
commit 57da8021d0
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,8 +162,8 @@ public class Enable2gPreferenceController extends TelephonyTogglePreferenceContr
@Override @Override
public int getAvailabilityStatus(int subId) { public int getAvailabilityStatus(int subId) {
if (mTelephonyManager == null) { if (mTelephonyManager == null) {
Log.w(LOG_TAG, "Telephony manager not yet initialized"); Log.w(LOG_TAG, "getAvailabilityStatus: Telephony manager not yet initialized");
mTelephonyManager = mContext.getSystemService(TelephonyManager.class); return CONDITIONALLY_UNAVAILABLE;
} }
boolean visible = boolean visible =
SubscriptionManager.isUsableSubscriptionId(subId) SubscriptionManager.isUsableSubscriptionId(subId)
@@ -189,6 +189,10 @@ public class Enable2gPreferenceController extends TelephonyTogglePreferenceContr
return false; return false;
} }
if (mTelephonyManager == null) {
Log.w(LOG_TAG, "isChecked: Telephony manager not yet initialized");
return false;
}
long currentlyAllowedNetworkTypes = mTelephonyManager.getAllowedNetworkTypesForReason( long currentlyAllowedNetworkTypes = mTelephonyManager.getAllowedNetworkTypesForReason(
mTelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G); mTelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G);
return (currentlyAllowedNetworkTypes & BITMASK_2G) != 0; return (currentlyAllowedNetworkTypes & BITMASK_2G) != 0;
@@ -214,6 +218,12 @@ public class Enable2gPreferenceController extends TelephonyTogglePreferenceContr
if (!SubscriptionManager.isUsableSubscriptionId(mSubId)) { if (!SubscriptionManager.isUsableSubscriptionId(mSubId)) {
return false; return false;
} }
if (mTelephonyManager == null) {
Log.w(LOG_TAG, "setChecked: Telephony manager not yet initialized");
return false;
}
long currentlyAllowedNetworkTypes = mTelephonyManager.getAllowedNetworkTypesForReason( long currentlyAllowedNetworkTypes = mTelephonyManager.getAllowedNetworkTypesForReason(
mTelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G); mTelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G);
boolean enabled = (currentlyAllowedNetworkTypes & BITMASK_2G) != 0; boolean enabled = (currentlyAllowedNetworkTypes & BITMASK_2G) != 0;