From 1bde3e7473d5968fd0daef32f3e808274564073e Mon Sep 17 00:00:00 2001
From: Andrew Sapperstein <asapperstein@google.com>
Date: Mon, 8 Apr 2019 16:45:26 -0700
Subject: [PATCH] Adds annotations in response to API feedback.

Fixes: 126699535
Test: is annotation change
Change-Id: Iba61b36386db78e568a5dfc5720646904c75b989
---
 api/system-current.txt                                   | 4 ++--
 core/java/android/provider/SearchIndexablesContract.java | 2 ++
 core/java/android/provider/SearchIndexablesProvider.java | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 64589093654eb..414f6bebf10ef 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5980,7 +5980,7 @@ package android.provider {
     field public static final String NON_INDEXABLES_KEYS_PATH = "settings/non_indexables_key";
     field public static final String PROVIDER_INTERFACE = "android.content.action.SEARCH_INDEXABLES_PROVIDER";
     field public static final String SLICE_URI_PAIRS = "slice_uri_pairs";
-    field public static final String[] SLICE_URI_PAIRS_COLUMNS;
+    field @NonNull public static final String[] SLICE_URI_PAIRS_COLUMNS;
     field public static final String SLICE_URI_PAIRS_PATH = "settings/slice_uri_pairs";
   }
 
@@ -6028,7 +6028,7 @@ package android.provider {
     method public android.database.Cursor query(android.net.Uri, String[], String, String[], String);
     method public abstract android.database.Cursor queryNonIndexableKeys(String[]);
     method public abstract android.database.Cursor queryRawData(String[]);
-    method public android.database.Cursor querySliceUriPairs();
+    method @Nullable public android.database.Cursor querySliceUriPairs();
     method public abstract android.database.Cursor queryXmlResources(String[]);
     method public final int update(android.net.Uri, android.content.ContentValues, String, String[]);
   }
diff --git a/core/java/android/provider/SearchIndexablesContract.java b/core/java/android/provider/SearchIndexablesContract.java
index 42c2d5ced8069..5f8266d2b5796 100644
--- a/core/java/android/provider/SearchIndexablesContract.java
+++ b/core/java/android/provider/SearchIndexablesContract.java
@@ -16,6 +16,7 @@
 
 package android.provider;
 
+import android.annotation.NonNull;
 import android.annotation.SystemApi;
 import android.content.ContentResolver;
 
@@ -210,6 +211,7 @@ public class SearchIndexablesContract {
     /**
      * Cursor schema for SliceUriPairs.
      */
+    @NonNull
     public static final String[] SLICE_URI_PAIRS_COLUMNS = new String[]{
             SliceUriPairColumns.KEY,
             SliceUriPairColumns.SLICE_URI
diff --git a/core/java/android/provider/SearchIndexablesProvider.java b/core/java/android/provider/SearchIndexablesProvider.java
index d505f02468d0c..da29e2e5e39f4 100644
--- a/core/java/android/provider/SearchIndexablesProvider.java
+++ b/core/java/android/provider/SearchIndexablesProvider.java
@@ -16,6 +16,7 @@
 
 package android.provider;
 
+import android.annotation.Nullable;
 import android.annotation.SystemApi;
 import android.app.slice.Slice;
 import android.content.ContentProvider;
@@ -184,6 +185,7 @@ public abstract class SearchIndexablesProvider extends ContentProvider {
      * Returns a {@link Cursor} linking {@link Slice} {@link Uri Uris} to the
      * corresponding Settings key.
      */
+    @Nullable
     public Cursor querySliceUriPairs() {
         // By default no-op;
         return null;