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

Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b am: 6891dd4590 am: 423f9801e9

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

Change-Id: Ibc85aecd1c5a83e67970fd9daf381e1da3f35bf2
This commit is contained in:
Treehugger Robot
2020-09-28 02:53:19 +00:00
committed by Automerger Merge Worker
parent 3501adcc86 423f9801e9
commit 2532a70ba1
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,6 +225,9 @@ public class Enhanced4gBasePreferenceController extends TelephonyTogglePreferenc
if (SubscriptionManager.isValidSubscriptionId(subId)) { if (SubscriptionManager.isValidSubscriptionId(subId)) {
mTelephonyManager = mTelephonyManager.createForSubscriptionId(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); mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
final long supportedRadioBitmask = mTelephonyManager.getSupportedRadioAccessFamily(); final long supportedRadioBitmask = mTelephonyManager.getSupportedRadioAccessFamily();

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

@@ -182,6 +182,9 @@ public class VideoCallingPreferenceController extends TelephonyTogglePreferenceC
if (SubscriptionManager.isValidSubscriptionId(subId)) { if (SubscriptionManager.isValidSubscriptionId(subId)) {
mTelephonyManager = mTelephonyManager.createForSubscriptionId(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); mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
} }

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

@@ -210,6 +210,9 @@ public class WifiCallingPreferenceController extends TelephonyBasePreferenceCont
public void register(Context context, int subId) { public void register(Context context, int subId) {
mTelephonyManager = getTelephonyManager(context, 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); mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
} }