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

Merge "Mark return value of onBind() as @Nullable"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-14 00:55:09 +00:00
committed by Android (Google) Code Review
parent ca877189c1 ddb043ebea
commit 2f734f66e5
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -6334,7 +6334,7 @@ package android.service.attention {
public abstract class AttentionService extends android.app.Service {
ctor public AttentionService();
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 onCancelAttentionCheck(int);
method public abstract void onCheckAttention(int, @NonNull android.service.attention.AttentionService.AttentionCallback);
field public static final int ATTENTION_FAILURE_PREEMPTED = 2; // 0x2

4
core/java/android/service/attention/AttentionService.java
View File

@@ -18,6 +18,7 @@ package android.service.attention;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.app.Service;
import android.content.Intent;
@@ -111,8 +112,9 @@ public abstract class AttentionService extends Service {
}
};
@Nullable
@Override
public final IBinder onBind(Intent intent) {
public final IBinder onBind(@NonNull Intent intent) {
if (SERVICE_INTERFACE.equals(intent.getAction())) {
return mBinder;
}