From 2f1c7586bcce334ca69022eb8dc6d8965ceb6a05 Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Mon, 19 Jun 2017 11:26:01 -0700 Subject: Update AOSP Dialer source from internal google3 repository at cl/159428781. Test: make, treehugger This CL updates the AOSP Dialer source with all the changes that have gone into the private google3 repository. This includes all the changes from cl/152373142 (4/06/2017) to cl/159428781 (6/19/2017). This goal of these drops is to keep the AOSP source in sync with the internal google3 repository. Currently these sync are done by hand with very minor modifications to the internal source code. See the Android.mk file for list of modifications. Our current goal is to do frequent drops (daily if possible) and eventually switched to an automated process. Change-Id: Ie60a84b3936efd0ea3d95d7c86bf96d2b1663030 --- .../dialer/lightbringer/stub/LightbringerStub.java | 55 +++++++++++++++++++--- 1 file changed, 48 insertions(+), 7 deletions(-) (limited to 'java/com/android/dialer/lightbringer/stub') diff --git a/java/com/android/dialer/lightbringer/stub/LightbringerStub.java b/java/com/android/dialer/lightbringer/stub/LightbringerStub.java index f9bb4cd6c..c835fea0f 100644 --- a/java/com/android/dialer/lightbringer/stub/LightbringerStub.java +++ b/java/com/android/dialer/lightbringer/stub/LightbringerStub.java @@ -19,7 +19,11 @@ package com.android.dialer.lightbringer.stub; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.support.annotation.MainThread; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.telecom.Call; +import android.telecom.PhoneAccountHandle; import com.android.dialer.common.Assert; import com.android.dialer.lightbringer.Lightbringer; import com.android.dialer.lightbringer.LightbringerListener; @@ -30,30 +34,67 @@ public class LightbringerStub implements Lightbringer { @Inject public LightbringerStub() {} + @MainThread @Override - public boolean isReachable(Context context, String number) { + public boolean isReachable(@NonNull Context context, @Nullable String number) { + Assert.isMainThread(); + Assert.isNotNull(context); return false; } + @MainThread @Override - public Intent getIntent(Context context, String number) { + public boolean supportsUpgrade(@NonNull Context context, @Nullable String number) { + Assert.isMainThread(); + Assert.isNotNull(context); + return false; + } + + @MainThread + @Override + public Intent getIntent(@NonNull Context context, @NonNull String number) { + Assert.isMainThread(); + Assert.isNotNull(context); + Assert.isNotNull(number); return null; } + @MainThread @Override - public void registerListener(LightbringerListener listener) {} + public void requestUpgrade(Call call) { + Assert.isMainThread(); + Assert.isNotNull(call); + } + @MainThread @Override - public void unregisterListener(LightbringerListener listener) {} + public void registerListener(LightbringerListener listener) { + Assert.isMainThread(); + Assert.isNotNull(listener); + } + + @MainThread + @Override + public void unregisterListener(LightbringerListener listener) { + Assert.isMainThread(); + Assert.isNotNull(listener); + } + + @Nullable + @Override + public ComponentName getPhoneAccountComponentName() { + return null; + } + @Nullable @Override - public ComponentName getPhoneAccountComponentName(Context context) { + public PhoneAccountHandle getPhoneAccountHandle() { return null; } @NonNull @Override - public String getPackageName(@NonNull Context context) { - throw Assert.createUnsupportedOperationFailException(); + public String getPackageName() { + return ""; } } -- cgit v1.2.3