commit f02e26a4e4199acf39b25e4962621ed5466f5aa6
author Brad Ebinger <breadley@google.com> Tue Jun 06 20:15:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 06 20:15:10 2017 +0000
tree bfa6864577a0ad02b42ec63c992053998e913ce0
parent efc2051c90ced1bd1086e19d918c5c613187cf2a
parent 9980350a1078240ebbe4b8649a9fa5f8369c5fc5

Merge "Fixes InCallControllerTests failure" into oc-dev am: 85182d30c3
am: 9980350a10

Change-Id: Ib0781051256fd4e3fb9712cdb2f6dc9537b18548

tests/src/com/android/server/telecom/tests/InCallControllerTests.java

diff --git a/tests/src/com/android/server/telecom/tests/InCallControllerTests.java b/tests/src/com/android/server/telecom/tests/InCallControllerTests.java
index 0546dce..0c6d3c7 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 @@
         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,