diff options
author | Meng Wang <mewan@google.com> | 2016-10-06 11:29:46 -0700 |
---|---|---|
committer | gitbuildkicker <android-build@google.com> | 2016-10-06 16:26:56 -0700 |
commit | dad940f3eeade411178c55eaed1fd10b1c4c9499 (patch) | |
tree | f7e58cedbb48b62cee8a387929d4b14dd281c182 | |
parent | 637dfd5e638e9b2d86029c8799d19efa2c55bc36 (diff) | |
download | ims-android-cts-7.1_r24.tar.gz |
ImsManager: updateWfcFeatureAndProvisionedValues use roaming stateandroid-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1nougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-cts-release
In updateImsServiceConfig, WFC should be updated according to roaming
state. Roaming-aware version of getWfcMode() should be used.
Bug: 31972897
Change-Id: Ic4d6a516373d6ccdadad4fd43ed9e092d8ef72a6
(cherry picked from commit 531a8b68b40cfbc48229dfb11814e7fd5a520563)
-rw-r--r-- | src/java/com/android/ims/ImsManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java index 5630af1e..6d8cef60 100644 --- a/src/java/com/android/ims/ImsManager.java +++ b/src/java/com/android/ims/ImsManager.java @@ -820,9 +820,10 @@ public class ImsManager { * @throws ImsException */ private boolean updateWfcFeatureAndProvisionedValues() throws ImsException { + boolean isNetworkRoaming = TelephonyManager.getDefault().isNetworkRoaming(); boolean available = isWfcEnabledByPlatform(mContext); boolean enabled = isWfcEnabledByUser(mContext); - int mode = getWfcMode(mContext); + int mode = getWfcMode(mContext, isNetworkRoaming); boolean roaming = isWfcRoamingEnabledByUser(mContext); boolean isFeatureOn = available && enabled; |