From a1af1b6fd590cee0726f4a484dee97bb1a8c9135 Mon Sep 17 00:00:00 2001 From: Stanley Wang Date: Tue, 14 Jan 2020 17:11:10 +0800 Subject: [PATCH] Remove the @hide annotation for the dynamic index of Settings Search. - Remove the @hide of queryDynamicRawData api in the SearchIndexablesProvider. - Remove the @hide of DYNAMIC_INDEXABLES_RAW and DYNAMIC_INDEXABLES_RAW_PATH strings in the SearchIndexablesContract. Fixes: 143670349 Test: manual Change-Id: Ic33060c21211a1ca0d56fe3329d19b53f4576dfe --- api/system-current.txt | 3 +++ .../android/provider/SearchIndexablesContract.java | 10 ++++------ .../android/provider/SearchIndexablesProvider.java | 4 +--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 41e55902cb489..51e62b6500c45 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -7763,6 +7763,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"; @@ -7820,6 +7822,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(); diff --git a/core/java/android/provider/SearchIndexablesContract.java b/core/java/android/provider/SearchIndexablesContract.java index 298628e7578ba..8fc13b7316f04 100644 --- a/core/java/android/provider/SearchIndexablesContract.java +++ b/core/java/android/provider/SearchIndexablesContract.java @@ -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; diff --git a/core/java/android/provider/SearchIndexablesProvider.java b/core/java/android/provider/SearchIndexablesProvider.java index 68284b4895c3f..f4d0cb4d43d39 100644 --- a/core/java/android/provider/SearchIndexablesProvider.java +++ b/core/java/android/provider/SearchIndexablesProvider.java @@ -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; }