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

Merge "Remove the @hide annotation for the dynamic index of Settings Search."

Browse Source
This commit is contained in:
Stanley Wang
2020-01-16 11:53:19 +00:00
committed by Android (Google) Code Review
parent f70990753d a1af1b6fd5
commit b2aafcb399
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/system-current.txt
View File

@@ -8014,6 +8014,8 @@ package android.provider {
field public static final int COLUMN_INDEX_XML_RES_INTENT_TARGET_PACKAGE = 5; // 0x5
field public static final int COLUMN_INDEX_XML_RES_RANK = 0; // 0x0
field public static final int COLUMN_INDEX_XML_RES_RESID = 1; // 0x1
field public static final String DYNAMIC_INDEXABLES_RAW = "dynamic_indexables_raw";
field public static final String DYNAMIC_INDEXABLES_RAW_PATH = "settings/dynamic_indexables_raw";
field public static final String INDEXABLES_RAW = "indexables_raw";
field public static final String[] INDEXABLES_RAW_COLUMNS;
field public static final String INDEXABLES_RAW_PATH = "settings/indexables_raw";
@@ -8071,6 +8073,7 @@ package android.provider {
method public String getType(android.net.Uri);
method public final android.net.Uri insert(android.net.Uri, android.content.ContentValues);
method public android.database.Cursor query(android.net.Uri, String[], String, String[], String);
method @Nullable public android.database.Cursor queryDynamicRawData(@Nullable String[]);
method public abstract android.database.Cursor queryNonIndexableKeys(String[]);
method public abstract android.database.Cursor queryRawData(String[]);
method @Nullable public android.database.Cursor querySliceUriPairs();

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

@@ -98,16 +98,14 @@ public class SearchIndexablesContract {
/**
* Dynamic indexable raw data names.
*
* @hide
* The raw data name of dynamic index. This is used to compose the index path of provider
* for dynamic index.
*/
public static final String DYNAMIC_INDEXABLES_RAW = "dynamic_indexables_raw";
/**
* ContentProvider path for dynamic indexable raw data.
*
* @hide
* ContentProvider path for dynamic index. This is used to get the raw data of dynamic index
* from provider.
*/
public static final String DYNAMIC_INDEXABLES_RAW_PATH =
SETTINGS + "/" + DYNAMIC_INDEXABLES_RAW;

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

@@ -204,11 +204,9 @@ public abstract class SearchIndexablesProvider extends ContentProvider {
* @param projection list of {@link android.provider.SearchIndexablesContract.RawData} columns
* to put into the cursor. If {@code null} all supported columns should be
* included.
*
* @hide
*/
@Nullable
public Cursor queryDynamicRawData(String[] projection) {
public Cursor queryDynamicRawData(@Nullable String[] projection) {
// By default no-op;
return null;
}