commit 2d29c01904be928af2ab413e0d76bb89a13d0952
author Brad Ebinger <breadley@google.com> Tue May 07 18:33:46 2019 -0700
committer Brad Ebinger <breadley@google.com> Wed May 08 01:37:10 2019 +0000
tree 3b267918f9f749b01e6413f1c4bfbbcbfd5ce6a5
parent 72de2f39aa1b4d0e94b6d9b5988b78b27b038a5d

Do not rely on roaming when setting WFC roaming setting

Bug: 131267855
Test: atest FrameworksTelephonyTests:ImsManagerTest
Change-Id: I759e7d77ef9f7d7d773bcdf51df826dd1e146a3b

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 495bee3..500a779 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -3067,10 +3067,8 @@
         final long identity = Binder.clearCallingIdentity();
         try {
             // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
-            boolean isRoaming = TelephonyManager.from(
-                    getPhone(subId).getContext()).isNetworkRoaming(subId);
             ImsManager.getInstance(mApp,
-                    getSlotIndexOrException(subId)).setWfcNonPersistent(isCapable, mode, isRoaming);
+                    getSlotIndexOrException(subId)).setWfcNonPersistent(isCapable, mode);
         } finally {
             Binder.restoreCallingIdentity(identity);
         }