commit c6b911fab781bac870687124a6f40bb3e2c1f4f5
author Jack Yu <jackyu@google.com> Sat Oct 19 17:23:55 2019 -0700
committer android-build-merger <android-build-merger@google.com> Sat Oct 19 17:23:55 2019 -0700
tree 1647dc8ac3a3d7f579f000abbb1a59938f0d1f80
parent 62fdc03222424f634e464b487611d1f48470e09e
parent b4c261766d2b076fc1cdc43acc6bf5d51c9ee5a8

Merge "CallFeaturesSettingTest: Solves failing test case" am: 6f51c6caa1 am: ddea30cf66 am: d5e75d173c
am: b4c261766d

Change-Id: If812b57e5551ba9e7d62c586ccc273771c6939a5

tests/src/com/android/phone/CallFeaturesSettingTest.java

diff --git a/tests/src/com/android/phone/CallFeaturesSettingTest.java b/tests/src/com/android/phone/CallFeaturesSettingTest.java
index 78d68e3..15d48ba 100644
--- a/tests/src/com/android/phone/CallFeaturesSettingTest.java
+++ b/tests/src/com/android/phone/CallFeaturesSettingTest.java
@@ -21,8 +21,12 @@
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.when;
 
+import android.content.Context;
+
+import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.FlakyTest;
 import androidx.test.rule.ActivityTestRule;
 
@@ -52,6 +56,8 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mActivity = mRule.getActivity();
+        Context targetContext = InstrumentationRegistry.getTargetContext();
+        doReturn(targetContext).when(mMockPhone).getContext();
     }
 
     @FlakyTest