Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f02e26a4 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Fixes InCallControllerTests failure" into oc-dev am: 85182d30 

am: 9980350a

Change-Id: Ib0781051256fd4e3fb9712cdb2f6dc9537b18548
parents efc2051c 9980350a

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

+1 −0
Original line number Diff line number Diff line
@@ -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,