From 9aed55ebd93e5195546277fc6073f2b1e8731378 Mon Sep 17 00:00:00 2001
From: Abodunrinwa Toki <toki@google.com>
Date: Wed, 10 Apr 2019 20:30:31 +0100
Subject: [PATCH] Null annotations in TC APIs.

Fixes: 126699077
Fixes: 126698613
Test: none
Change-Id: I5eab3d7e4e15995e0b5a163dbfdc2b2923ddc136
---
 api/current.txt                                                 | 2 +-
 api/system-current.txt                                          | 2 +-
 .../android/service/textclassifier/TextClassifierService.java   | 1 +
 core/java/android/view/textclassifier/TextLinks.java            | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 5997043cdd4ab..77fa5b8bf9ae0 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -54010,7 +54010,7 @@ package android.view.textclassifier {
     method public int getEnd();
     method @NonNull public String getEntity(int);
     method public int getEntityCount();
-    method public android.os.Bundle getExtras();
+    method @NonNull public android.os.Bundle getExtras();
     method public int getStart();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.view.textclassifier.TextLinks.TextLink> CREATOR;
diff --git a/api/system-current.txt b/api/system-current.txt
index 76b8f66105906..6e52896c7c3fd 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -6816,7 +6816,7 @@ package android.service.textclassifier {
 
   public abstract class TextClassifierService extends android.app.Service {
     ctor public TextClassifierService();
-    method public static android.view.textclassifier.TextClassifier getDefaultTextClassifierImplementation(@NonNull android.content.Context);
+    method @NonNull public static android.view.textclassifier.TextClassifier getDefaultTextClassifierImplementation(@NonNull android.content.Context);
     method @Deprecated public final android.view.textclassifier.TextClassifier getLocalTextClassifier();
     method @Nullable public final android.os.IBinder onBind(android.content.Intent);
     method @MainThread public abstract void onClassifyText(@Nullable android.view.textclassifier.TextClassificationSessionId, @NonNull android.view.textclassifier.TextClassification.Request, @NonNull android.os.CancellationSignal, @NonNull android.service.textclassifier.TextClassifierService.Callback<android.view.textclassifier.TextClassification>);
diff --git a/core/java/android/service/textclassifier/TextClassifierService.java b/core/java/android/service/textclassifier/TextClassifierService.java
index 4088ce8ea4b0c..30c4e900f83cc 100644
--- a/core/java/android/service/textclassifier/TextClassifierService.java
+++ b/core/java/android/service/textclassifier/TextClassifierService.java
@@ -358,6 +358,7 @@ public abstract class TextClassifierService extends Service {
     /**
      * Returns the platform's default TextClassifier implementation.
      */
+    @NonNull
     public static TextClassifier getDefaultTextClassifierImplementation(@NonNull Context context) {
         final TextClassificationManager tcm =
                 context.getSystemService(TextClassificationManager.class);
diff --git a/core/java/android/view/textclassifier/TextLinks.java b/core/java/android/view/textclassifier/TextLinks.java
index cde27a08fc798..f59ce49e15427 100644
--- a/core/java/android/view/textclassifier/TextLinks.java
+++ b/core/java/android/view/textclassifier/TextLinks.java
@@ -283,6 +283,7 @@ public final class TextLinks implements Parcelable {
         /**
          * Returns a bundle containing custom data related to this TextLink.
          */
+        @NonNull
         public Bundle getExtras() {
             return mExtras;
         }