commit 74fa961299710755b36f03d373eed58b17fe588d
author Fan Zhang <zhfan@google.com> Mon Apr 01 14:50:41 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 01 14:50:41 2019 -0700
tree e09bc6735389621ce541529a56421253e994918a
parent 33aba7c0d01e19111af5111c65ca680b6a5b768d
parent 3a19c32bfe8576f34bb1314626b8f7ab77cf8614

Merge "WifiCallingSettingsForSubTest: Solve casting problem in setup" am: 8877dc8fd0
am: 3a19c32bfe

Change-Id: Ifc39462efeb50a6776cf4e419df650164ad5f1a5

tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java

diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
index fbdc303..8f01d39 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java
@@ -92,8 +92,8 @@
     @Mock private ToggleSwitch mToggleSwitch;
     @Mock private View mView;
     @Mock private ImsConfig mImsConfig;
-    @Mock private ListPreference mButtonWfcMode;
-    @Mock private ListPreference mButtonWfcRoamingMode;
+    @Mock private ListWithEntrySummaryPreference mButtonWfcMode;
+    @Mock private ListWithEntrySummaryPreference mButtonWfcRoamingMode;
     @Mock private Preference mUpdateAddress;
 
     @Before