From b2b6365629aed422a006529fe7940612f778baed Mon Sep 17 00:00:00 2001 From: twyen Date: Mon, 7 May 2018 16:36:17 -0700 Subject: Place Duo calls with PreCall This CL consolidates common duo calling operations into precall, including checking reachability, falling back to carrier video call, placing the call to duo with startActivityForResult. TEST=TAP Bug: 78783816 Test: TAP PiperOrigin-RevId: 195742478 Change-Id: I9fea1e4999f604e1f3a153b28079cd0db77b7393 --- java/com/android/dialer/duo/stub/DuoStub.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'java/com/android/dialer/duo/stub') diff --git a/java/com/android/dialer/duo/stub/DuoStub.java b/java/com/android/dialer/duo/stub/DuoStub.java index b0867148f..2131d16f7 100644 --- a/java/com/android/dialer/duo/stub/DuoStub.java +++ b/java/com/android/dialer/duo/stub/DuoStub.java @@ -29,6 +29,9 @@ import com.android.dialer.common.Assert; import com.android.dialer.duo.Duo; import com.android.dialer.duo.DuoListener; import com.google.common.base.Optional; +import com.google.common.collect.ImmutableMap; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; import java.util.List; import javax.inject.Inject; @@ -72,10 +75,12 @@ public class DuoStub implements Duo { } @Override - public void updateReachability(@NonNull Context context, @NonNull List numbers) { + public ListenableFuture> updateReachability( + @NonNull Context context, @NonNull List numbers) { Assert.isMainThread(); Assert.isNotNull(context); Assert.isNotNull(numbers); + return Futures.immediateFuture(ImmutableMap.of()); } @Override @@ -114,11 +119,6 @@ public class DuoStub implements Duo { return Optional.absent(); } - @Override - public Optional getIntentType(Intent intent) { - return Optional.absent(); - } - @Override public Optional getInstallDuoIntent() { return null; -- cgit v1.2.3 From 2f4a0075e9f546514359eda60a24ac9cd49ea80a Mon Sep 17 00:00:00 2001 From: weijiaxu Date: Wed, 9 May 2018 16:28:04 -0700 Subject: Add some annotations that won't influence aosp. Test: blaze test. PiperOrigin-RevId: 196047666 Change-Id: Ia54e342113f9dbc9fe884b9a85d0f4db33f94cf5 --- java/com/android/dialer/duo/stub/StubDuoModule.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'java/com/android/dialer/duo/stub') diff --git a/java/com/android/dialer/duo/stub/StubDuoModule.java b/java/com/android/dialer/duo/stub/StubDuoModule.java index 604406a94..8966602bb 100644 --- a/java/com/android/dialer/duo/stub/StubDuoModule.java +++ b/java/com/android/dialer/duo/stub/StubDuoModule.java @@ -17,10 +17,13 @@ package com.android.dialer.duo.stub; import com.android.dialer.duo.Duo; +import com.android.dialer.inject.DialerVariant; +import com.android.dialer.inject.InstallIn; import dagger.Binds; import dagger.Module; import javax.inject.Singleton; +@InstallIn(variants = {DialerVariant.DIALER_TEST}) @Module public abstract class StubDuoModule { -- cgit v1.2.3