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

Commit af05f630 authored by Bonian Chen's avatar Bonian Chen Committed by Android (Google) Code Review
Browse files

Merge "[Settings] To avoid from crash when callback" into rvc-dev

parents 1f91111c 0f471475

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

+3 −0
Original line number Diff line number Diff line
@@ -133,6 +133,9 @@ public class Enhanced4gBasePreferenceController extends TelephonyTogglePreferenc 
    @Override

    public void updateState(Preference preference) {

        super.updateState(preference);

        if (preference == null) {

            return;

        }

        final SwitchPreference switchPreference = (SwitchPreference) preference;



        final VolteQueryImsState queryState = queryImsState(mSubId);

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

+2 −1
Original line number Diff line number Diff line
@@ -91,7 +91,8 @@ public class VideoCallingPreferenceController extends TelephonyTogglePreferenceC 
    @Override

    public void updateState(Preference preference) {

        super.updateState(preference);

        if (mCallState == null) {

        if ((mCallState == null) || (preference == null)) {

            Log.d(TAG, "Skip update under mCallState=" + mCallState);

            return;

        }

        final SwitchPreference switchPreference = (SwitchPreference) preference;

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

+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.telephony.PhoneStateListener; 
import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.ims.ImsMmTelManager;

import android.util.Log;



import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;
@@ -98,7 +99,8 @@ public class WifiCallingPreferenceController extends TelephonyBasePreferenceCont 
    @Override

    public void updateState(Preference preference) {

        super.updateState(preference);

        if (mCallState == null) {

        if ((mCallState == null) || (preference == null)) {

            Log.d(TAG, "Skip update under mCallState=" + mCallState);

            return;

        }

        CharSequence summaryText = null;