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

Merge "[Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case" am: 3c934b2859 am: 80a69cb5e0

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

Change-Id: Iaa5acc6cfdd34acf82c0b20b6016f30963c7b737
This commit is contained in:
Bonian Chen
2020-11-26 08:40:08 +00:00
committed by Automerger Merge Worker
parent b03d666b47 80a69cb5e0
commit fc69b02cde
2 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,8 +57,7 @@ public class Enhanced4gBasePreferenceController extends TelephonyTogglePreferenc
private boolean mShow5gLimitedDialog;
boolean mIsNrEnabledFromCarrierConfig;
private boolean mHas5gCapability;
@VisibleForTesting
Integer mCallState;
private Integer mCallState;
private final List<On4gLteUpdateListener> m4gLteListeners;
protected static final int MODE_NONE = -1;
@@ -199,8 +198,13 @@ public class Enhanced4gBasePreferenceController extends TelephonyTogglePreferenc
return new VolteQueryImsState(mContext, subId);
}
@VisibleForTesting
boolean isCallStateIdle() {
return (mCallState != null) && (mCallState == TelephonyManager.CALL_STATE_IDLE);
}
private boolean isUserControlAllowed(final PersistableBundle carrierConfig) {
return (mCallState != null) && (mCallState == TelephonyManager.CALL_STATE_IDLE)
return isCallStateIdle()
&& (carrierConfig != null)
&& carrierConfig.getBoolean(
CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL);