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

Commit 423f9801 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Avoid unexpected state changes for enhanced preferences" am: 7f627136 am: 6891dd45 

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

Change-Id: Ibaaf851ae4b9b486b83b795aa9818413cd0f14bf
parents f01d2605 6891dd45

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

+3 −0
Original line number Diff line number Diff line
@@ -225,6 +225,9 @@ public class Enhanced4gBasePreferenceController extends TelephonyTogglePreferenc 
            if (SubscriptionManager.isValidSubscriptionId(subId)) {

                mTelephonyManager = mTelephonyManager.createForSubscriptionId(subId);

            }

            // assign current call state so that it helps to show correct preference state even

            // before first onCallStateChanged() by initial registration.

            mCallState = mTelephonyManager.getCallState(subId);

            mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);



            final long supportedRadioBitmask = mTelephonyManager.getSupportedRadioAccessFamily();

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

+3 −0
Original line number Diff line number Diff line
@@ -182,6 +182,9 @@ public class VideoCallingPreferenceController extends TelephonyTogglePreferenceC 
            if (SubscriptionManager.isValidSubscriptionId(subId)) {

                mTelephonyManager = mTelephonyManager.createForSubscriptionId(subId);

            }

            // assign current call state so that it helps to show correct preference state even

            // before first onCallStateChanged() by initial registration.

            mCallState = mTelephonyManager.getCallState(subId);

            mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);

        }

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

+3 −0
Original line number Diff line number Diff line
@@ -210,6 +210,9 @@ public class WifiCallingPreferenceController extends TelephonyBasePreferenceCont 


        public void register(Context context, int subId) {

            mTelephonyManager = getTelephonyManager(context, subId);

            // assign current call state so that it helps to show correct preference state even

            // before first onCallStateChanged() by initial registration.

            mCallState = mTelephonyManager.getCallState(subId);

            mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);

        }