diff options
| author | Brad Ebinger <breadley@google.com> | 2017-06-06 20:00:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-06 20:00:44 +0000 |
| commit | 85182d30c398ba3119be17f0b8305492285a00f7 (patch) | |
| tree | 0a226936d9221f189097e5b94786ba062c63ed88 | |
| parent | a32bdf7289370be5a64201ce216b1ee4cf74944f (diff) | |
| parent | 782f91109ff869a6078bb8dd9294d3172d2a6903 (diff) | |
| download | Telecomm-85182d30c398ba3119be17f0b8305492285a00f7.tar.gz | |
Merge "Fixes InCallControllerTests failure" into oc-devandroid-vts-8.0_r2android-vts-8.0_r1oreo-dev
| -rw-r--r-- | tests/src/com/android/server/telecom/tests/InCallControllerTests.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/src/com/android/server/telecom/tests/InCallControllerTests.java b/tests/src/com/android/server/telecom/tests/InCallControllerTests.java index 0546dcef4..0c6d3c71a 100644 --- a/tests/src/com/android/server/telecom/tests/InCallControllerTests.java +++ b/tests/src/com/android/server/telecom/tests/InCallControllerTests.java @@ -109,6 +109,7 @@ public class InCallControllerTests extends TelecomTestCase { doReturn(mMockResources).when(mMockContext).getResources(); doReturn(SYS_PKG).when(mMockResources).getString(R.string.ui_default_package); doReturn(SYS_CLASS).when(mMockResources).getString(R.string.incall_default_class); + doReturn(true).when(mMockResources).getBoolean(R.bool.grant_location_permission_enabled); mEmergencyCallHelper = new EmergencyCallHelper(mMockContext, SYS_PKG, mTimeoutsAdapter); mInCallController = new InCallController(mMockContext, mLock, mMockCallsManager, |