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

1 files changed, 15 insertions, 3 deletions

diff --git a/java/com/android/dialer/lightbringer/Lightbringer.java b/java/com/android/dialer/lightbringer/Lightbringer.java
index 8caafda7e..510f8a9a7 100644
--- a/java/com/android/dialer/lightbringer/Lightbringer.java
+++ b/java/com/android/dialer/lightbringer/Lightbringer.java
@@ -22,16 +22,24 @@ 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;
 
 public interface Lightbringer {
 
   @MainThread
-  boolean isReachable(@NonNull Context context, @NonNull String number);
+  boolean isReachable(@NonNull Context context, @Nullable String number);
+
+  @MainThread
+  boolean supportsUpgrade(@NonNull Context context, @Nullable String number);
 
   @MainThread
   Intent getIntent(@NonNull Context context, @NonNull String number);
 
   @MainThread
+  void requestUpgrade(Call call);
+
+  @MainThread
   void registerListener(@NonNull LightbringerListener listener);
 
   @MainThread
@@ -39,9 +47,13 @@ public interface Lightbringer {
 
   @Nullable
   @MainThread
-  ComponentName getPhoneAccountComponentName(@NonNull Context context);
+  ComponentName getPhoneAccountComponentName();
+
+  @Nullable
+  @MainThread
+  PhoneAccountHandle getPhoneAccountHandle();
 
   @NonNull
   @MainThread
-  String getPackageName(@NonNull Context context);
+  String getPackageName();
 }