2 files changed, 94 insertions, 12 deletions

diff --git a/java/com/android/dialer/lightbringer/Lightbringer.java b/java/com/android/dialer/lightbringer/Lightbringer.java
index 8caafda7e..9120b24db 100644
--- a/java/com/android/dialer/lightbringer/Lightbringer.java
+++ b/java/com/android/dialer/lightbringer/Lightbringer.java
@@ -22,16 +22,27 @@ import android.content.Intent;
 import android.support.annotation.MainThread;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+import android.telecom.Call;
+import android.telecom.PhoneAccountHandle;
 
 public interface Lightbringer {
 
+  boolean isEnabled();
+
+  @MainThread
+  boolean isReachable(@NonNull Context context, @Nullable String number);
+
   @MainThread
-  boolean isReachable(@NonNull Context context, @NonNull String number);
+  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 +50,21 @@ public interface Lightbringer {
 
   @Nullable
   @MainThread
-  ComponentName getPhoneAccountComponentName(@NonNull Context context);
+  ComponentName getPhoneAccountComponentName();
+
+  @Nullable
+  @MainThread
+  PhoneAccountHandle getPhoneAccountHandle();
+
+  @Nullable
+  @MainThread
+  String getPackageName();
+
+  @StringRes
+  @MainThread
+  int getOutgoingCallTypeText();
 
-  @NonNull
+  @StringRes
   @MainThread
-  String getPackageName(@NonNull Context context);
+  int getIncomingCallTypeText();
 }
diff --git a/java/com/android/dialer/lightbringer/stub/LightbringerStub.java b/java/com/android/dialer/lightbringer/stub/LightbringerStub.java
index f9bb4cd6c..c98ae091b 100644
--- a/java/com/android/dialer/lightbringer/stub/LightbringerStub.java
+++ b/java/com/android/dialer/lightbringer/stub/LightbringerStub.java
@@ -19,7 +19,12 @@ 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.support.annotation.StringRes;
+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;
@@ -31,29 +36,83 @@ public class LightbringerStub implements Lightbringer {
   public LightbringerStub() {}
 
   @Override
-  public boolean isReachable(Context context, String number) {
+  public boolean isEnabled() {
     return false;
   }
 
+  @MainThread
   @Override
-  public Intent getIntent(Context context, String number) {
+  public boolean isReachable(@NonNull Context context, @Nullable String number) {
+    Assert.isMainThread();
+    Assert.isNotNull(context);
+    return false;
+  }
+
+  @MainThread
+  @Override
+  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 requestUpgrade(Call call) {
+    Assert.isMainThread();
+    Assert.isNotNull(call);
+  }
+
+  @MainThread
+  @Override
+  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 void registerListener(LightbringerListener listener) {}
+  public ComponentName getPhoneAccountComponentName() {
+    return null;
+  }
 
+  @Nullable
   @Override
-  public void unregisterListener(LightbringerListener listener) {}
+  public PhoneAccountHandle getPhoneAccountHandle() {
+    return null;
+  }
 
+  @Nullable
   @Override
-  public ComponentName getPhoneAccountComponentName(Context context) {
+  public String getPackageName() {
     return null;
   }
 
-  @NonNull
+  @StringRes
+  @Override
+  public int getOutgoingCallTypeText() {
+    return -1;
+  }
+
+  @StringRes
   @Override
-  public String getPackageName(@NonNull Context context) {
-    throw Assert.createUnsupportedOperationFailException();
+  public int getIncomingCallTypeText() {
+    return -1;
   }
 }