Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "CallRedirectionService API review" am: 1276a178fd

Browse Source 
am: de633a49f1

Change-Id: Iedac1e363872fc390df007d5b4e977c03e725bdf
This commit is contained in:
sqian
2019-03-15 20:07:25 -07:00
committed by android-build-merger
parent b578ef38ed de633a49f1
commit b09f8d20e3
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -41274,9 +41274,9 @@ package android.telecom {
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";

5
telecomm/java/android/telecom/CallRedirectionService.java
View File

@@ -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 @@ public abstract class CallRedirectionService extends Service {
}
@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;
}
}