From 3eca69f8ceb91537f72ca6df797bf4cfd93bc41b Mon Sep 17 00:00:00 2001 From: roldenburg Date: Tue, 16 Jan 2018 12:07:04 -0800 Subject: Use EmptyVideoTech instead of null RcsVideoShare VideoTech impl when unavailable Bug: 67005309,71880949 Test: VideoTechManagerTest PiperOrigin-RevId: 182091664 Change-Id: I0be4d4f9740e2bb678e772ec8526ccf176c334eb --- java/com/android/dialer/enrichedcall/RcsVideoShareFactory.java | 1 + java/com/android/dialer/enrichedcall/stub/StubEnrichedCallModule.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'java/com/android/dialer/enrichedcall') diff --git a/java/com/android/dialer/enrichedcall/RcsVideoShareFactory.java b/java/com/android/dialer/enrichedcall/RcsVideoShareFactory.java index 38f91da7d..faea3bc5a 100644 --- a/java/com/android/dialer/enrichedcall/RcsVideoShareFactory.java +++ b/java/com/android/dialer/enrichedcall/RcsVideoShareFactory.java @@ -23,6 +23,7 @@ import com.android.incallui.videotech.VideoTech.VideoTechListener; /** Interface for creating new RCS video tech instances. */ public interface RcsVideoShareFactory { + @NonNull VideoTech newRcsVideoShare( @NonNull EnrichedCallManager enrichedCallManager, @NonNull VideoTechListener videoTechListener, diff --git a/java/com/android/dialer/enrichedcall/stub/StubEnrichedCallModule.java b/java/com/android/dialer/enrichedcall/stub/StubEnrichedCallModule.java index 6ee1a86a9..93e15790a 100644 --- a/java/com/android/dialer/enrichedcall/stub/StubEnrichedCallModule.java +++ b/java/com/android/dialer/enrichedcall/stub/StubEnrichedCallModule.java @@ -18,6 +18,7 @@ package com.android.dialer.enrichedcall.stub; import com.android.dialer.enrichedcall.EnrichedCallManager; import com.android.dialer.enrichedcall.RcsVideoShareFactory; +import com.android.incallui.videotech.empty.EmptyVideoTech; import dagger.Module; import dagger.Provides; import javax.inject.Singleton; @@ -35,7 +36,7 @@ public class StubEnrichedCallModule { @Provides @Singleton static RcsVideoShareFactory providesRcsVideoShareFactory() { - return (enrichedCallManager, videoTechListener, number) -> null; + return (enrichedCallManager, videoTechListener, number) -> new EmptyVideoTech(); } private StubEnrichedCallModule() {} -- cgit v1.2.3