Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 233665d4 authored by Tom Hsu's avatar Tom Hsu Committed by Automerger Merge Worker
Browse files

Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into... 

Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fb am: 86db37dd

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462



Change-Id: I2a71646abcb9264fec4820230718a18f20243efe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d8fbd089 86db37dd

src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.os.PersistableBundle; 
import android.telephony.CarrierConfigManager;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.util.Log;



import androidx.preference.ListPreference;

import androidx.preference.Preference;
@@ -34,6 +35,7 @@ import com.android.settings.network.telephony.TelephonyConstants.TelephonyManage 
 */

public class PreferredNetworkModePreferenceController extends TelephonyBasePreferenceController

        implements ListPreference.OnPreferenceChangeListener {

    private static final String TAG = "PrefNetworkModeCtrl";



    private CarrierConfigCache mCarrierConfigCache;

    private TelephonyManager mTelephonyManager;
@@ -99,6 +101,10 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe 
    }



    private int getPreferredNetworkMode() {

        if (mTelephonyManager == null) {

            Log.w(TAG, "TelephonyManager is null");

            return TelephonyManagerConstants.NETWORK_MODE_UNKNOWN;

        }

        return MobileNetworkUtils.getNetworkTypeFromRaf(

                (int) mTelephonyManager.getAllowedNetworkTypesForReason(

                        TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER));