commit 3a19c32bfe8576f34bb1314626b8f7ab77cf8614
author Fan Zhang <zhfan@google.com> Mon Apr 01 14:45:32 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 01 14:45:32 2019 -0700
tree 2e71ee1341548821ffcac274af3b416350b6beed
parent d42dcf04dbe58d488351c00c17ac2383a89fa908
parent 8877dc8fd0e05102e5cb54bed7de55b8efcae83d

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

Change-Id: I34fd41dfc4e12c069f78cb017f8f754a43689b74

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