commit 1276a178fd24f42d3c4bcbd44894c2c27ec3b478
author Treehugger Robot <treehugger-gerrit@google.com> Sat Mar 16 02:42:29 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 16 02:42:29 2019 +0000
tree dce1932f9dc3faa34f297a3c596b71e399fe24f4
parent c4e2b24d87c55bbe83f576af53e38ac7e4a63e3b
parent b8cbc4e27d92bf8996ff53f4ebc5ac0773a277da

Merge "CallRedirectionService API review"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index f132eff..0fa6cc6 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -41276,9 +41276,9 @@
   public abstract class CallRedirectionService extends android.app.Service {
     ctor public CallRedirectionService();
     method public final void cancelCall();
-    method public final android.os.IBinder onBind(android.content.Intent);
+    method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);
     method public abstract void onPlaceCall(@NonNull android.net.Uri, @NonNull android.telecom.PhoneAccountHandle, boolean);
-    method public final boolean onUnbind(android.content.Intent);
+    method public final boolean onUnbind(@NonNull android.content.Intent);
     method public final void placeCallUnmodified();
     method public final void redirectCall(@NonNull android.net.Uri, @NonNull android.telecom.PhoneAccountHandle, boolean);
     field public static final String SERVICE_INTERFACE = "android.telecom.CallRedirectionService";

telecomm/java/android/telecom/CallRedirectionService.java

diff --git a/telecomm/java/android/telecom/CallRedirectionService.java b/telecomm/java/android/telecom/CallRedirectionService.java
index d521e30..d01c889 100644
--- a/telecomm/java/android/telecom/CallRedirectionService.java
+++ b/telecomm/java/android/telecom/CallRedirectionService.java
@@ -17,6 +17,7 @@
 package android.telecom;
 
 import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.annotation.SdkConstant;
 import android.app.Service;
 import android.content.Intent;
@@ -206,12 +207,12 @@
     }
 
     @Override
-    public final IBinder onBind(Intent intent) {
+    public final @Nullable IBinder onBind(@NonNull Intent intent) {
         return new CallRedirectionBinder();
     }
 
     @Override
-    public final boolean onUnbind(Intent intent) {
+    public final boolean onUnbind(@NonNull Intent intent) {
         return false;
     }
 }