Merge "Null annotations in TC APIs." into qt-dev
diff --git a/api/current.txt b/api/current.txt
index ba189b5..7878eb6 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -54013,7 +54013,7 @@
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 ea38ab3..2fc3d19 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -6789,7 +6789,7 @@
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 4088ce8..30c4e90 100644
--- a/core/java/android/service/textclassifier/TextClassifierService.java
+++ b/core/java/android/service/textclassifier/TextClassifierService.java
@@ -358,6 +358,7 @@
/**
* 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 66a72f9..f3e0dc1 100644
--- a/core/java/android/view/textclassifier/TextLinks.java
+++ b/core/java/android/view/textclassifier/TextLinks.java
@@ -281,6 +281,7 @@
/**
* Returns a bundle containing custom data related to this TextLink.
*/
+ @NonNull
public Bundle getExtras() {
return mExtras;
}