From ddb043ebeac4accb8dc4777d9894bd670554f50b Mon Sep 17 00:00:00 2001
From: Alex Salo <asalo@google.com>
Date: Thu, 28 Feb 2019 09:19:45 -0800
Subject: [PATCH] Mark return value of onBind() as @Nullable

Also mark the argument as @NonNull

Bug: 126701378
Test: manually
Change-Id: Ib2689b1f9932df88d8c62c3d82960874d992fb6f
---
 api/system-current.txt                                    | 2 +-
 core/java/android/service/attention/AttentionService.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 7cd8c143dfd75..3a04ebf0a1794 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -6337,7 +6337,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
diff --git a/core/java/android/service/attention/AttentionService.java b/core/java/android/service/attention/AttentionService.java
index 24d74ffd747d4..32f4ea9a23ed2 100644
--- a/core/java/android/service/attention/AttentionService.java
+++ b/core/java/android/service/attention/AttentionService.java
@@ -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;
         }