From d8eb77f116ba21a4f40fd59d608b2e8bbdf2e09b Mon Sep 17 00:00:00 2001 From: Tyler Gunn Date: Fri, 1 Apr 2016 10:23:42 -0700 Subject: Add support for multi-endpoint. - Add new "ExternalCallNotifier" which tracks external calls that Telecom informs Incall about. - Refactored some common code from StatusBarNotifier that is used in ExternalCallNotifier into NotificationUtil so it can be used in both places. - Modified CallList to track and store external calls seperately from regular ones. - Added support for triggering a call pull in the NotificationBroadcastReceiver. Bug: 27458894 Change-Id: I505c8b5f7aad273ebdaaeae2431564d10b23770b --- InCallUI/tests/src/com/android/incallui/InCallPresenterTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'InCallUI/tests') diff --git a/InCallUI/tests/src/com/android/incallui/InCallPresenterTest.java b/InCallUI/tests/src/com/android/incallui/InCallPresenterTest.java index ed8d6223c..f0f08ab68 100644 --- a/InCallUI/tests/src/com/android/incallui/InCallPresenterTest.java +++ b/InCallUI/tests/src/com/android/incallui/InCallPresenterTest.java @@ -39,6 +39,7 @@ public class InCallPresenterTest extends InstrumentationTestCase { @Mock private InCallActivity mInCallActivity; @Mock private AudioModeProvider mAudioModeProvider; @Mock private StatusBarNotifier mStatusBarNotifier; + @Mock private ExternalCallNotifier mExternalCallNotifier; @Mock private ContactInfoCache mContactInfoCache; @Mock private ProximitySensor mProximitySensor; @@ -57,8 +58,9 @@ public class InCallPresenterTest extends InstrumentationTestCase { when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager); mInCallPresenter = InCallPresenter.getInstance(); - mInCallPresenter.setUp(mContext, mCallList.getCallList(), mAudioModeProvider, - mStatusBarNotifier, mContactInfoCache, mProximitySensor); + mInCallPresenter.setUp(mContext, mCallList.getCallList(), new ExternalCallList(), + mAudioModeProvider, mStatusBarNotifier, mExternalCallNotifier, mContactInfoCache, + mProximitySensor); } @Override -- cgit v1.2.3