Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bde3e74 authored by Andrew Sapperstein's avatar Andrew Sapperstein
Browse files

Adds annotations in response to API feedback. 

Fixes: 126699535
Test: is annotation change
Change-Id: Iba61b36386db78e568a5dfc5720646904c75b989
parent 8085254e

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -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[]);















  }

































core/java/android/provider/SearchIndexablesContract.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -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

































core/java/android/provider/SearchIndexablesProvider.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -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;