Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adds annotations in response to API feedback." into qt-dev

Browse Source 
am: b7cbb87e90

Change-Id: I4cba298d55bf8188b37a3e0e30fe5eb812fd0d1e
This commit is contained in:
Andrew Sapperstein
2019-04-08 20:59:25 -07:00
committed by android-build-merger
parent 3f06b50a55 b7cbb87e90
commit e01b71f1ef
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/system-current.txt
View File

@@ -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 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 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 = "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"; 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 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 queryNonIndexableKeys(String[]);
method public abstract android.database.Cursor queryRawData(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 abstract android.database.Cursor queryXmlResources(String[]);
method public final int update(android.net.Uri, android.content.ContentValues, String, String[]); method public final int update(android.net.Uri, android.content.ContentValues, String, String[]);
} }

2
core/java/android/provider/SearchIndexablesContract.java
View File

@@ -16,6 +16,7 @@
package android.provider; package android.provider;
import android.annotation.NonNull;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.content.ContentResolver; import android.content.ContentResolver;
@@ -210,6 +211,7 @@ public class SearchIndexablesContract {
/** /**
* Cursor schema for SliceUriPairs. * Cursor schema for SliceUriPairs.
*/ */
@NonNull
public static final String[] SLICE_URI_PAIRS_COLUMNS = new String[]{ public static final String[] SLICE_URI_PAIRS_COLUMNS = new String[]{
SliceUriPairColumns.KEY, SliceUriPairColumns.KEY,
SliceUriPairColumns.SLICE_URI SliceUriPairColumns.SLICE_URI

2
core/java/android/provider/SearchIndexablesProvider.java
View File

@@ -16,6 +16,7 @@
package android.provider; package android.provider;
import android.annotation.Nullable;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.app.slice.Slice; import android.app.slice.Slice;
import android.content.ContentProvider; 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 * Returns a {@link Cursor} linking {@link Slice} {@link Uri Uris} to the
* corresponding Settings key. * corresponding Settings key.
*/ */
@Nullable
public Cursor querySliceUriPairs() { public Cursor querySliceUriPairs() {
// By default no-op; // By default no-op;
return null; return null;