diff options
3 files changed, 15 insertions, 1 deletions
diff --git a/packages/SettingsLib/Spa/gallery/AndroidManifest.xml b/packages/SettingsLib/Spa/gallery/AndroidManifest.xml index d32d65906efb..965fdcfd6f98 100644 --- a/packages/SettingsLib/Spa/gallery/AndroidManifest.xml +++ b/packages/SettingsLib/Spa/gallery/AndroidManifest.xml @@ -38,7 +38,12 @@ <provider android:name="com.android.settingslib.spa.search.SpaSearchProvider" android:authorities="com.android.spa.gallery.search.provider" - android:exported="false"> + android:exported="true" + android:grantUriPermissions="true" + android:permission="android.permission.READ_SEARCH_INDEXABLES"> + <intent-filter> + <action android:name="android.content.action.SPA_SEARCH_PROVIDER" /> + </intent-filter> </provider> <provider android:name="com.android.settingslib.spa.slice.SpaSliceProvider" diff --git a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/search/SpaSearchContract.kt b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/search/SpaSearchContract.kt index 2301f0485040..9da70e1307f7 100644 --- a/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/search/SpaSearchContract.kt +++ b/packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/search/SpaSearchContract.kt @@ -76,6 +76,7 @@ enum class QueryEnum( ColumnEnum.SEARCH_PATH, ColumnEnum.INTENT_TARGET_PACKAGE, ColumnEnum.INTENT_TARGET_CLASS, + ColumnEnum.INTENT_EXTRAS, ColumnEnum.SLICE_URI, ColumnEnum.LEGACY_KEY ) diff --git a/packages/SettingsLib/Spa/tests/src/com/android/settingslib/spa/search/SpaSearchProviderTest.kt b/packages/SettingsLib/Spa/tests/src/com/android/settingslib/spa/search/SpaSearchProviderTest.kt index 831aded638a2..be3cffd380d2 100644 --- a/packages/SettingsLib/Spa/tests/src/com/android/settingslib/spa/search/SpaSearchProviderTest.kt +++ b/packages/SettingsLib/Spa/tests/src/com/android/settingslib/spa/search/SpaSearchProviderTest.kt @@ -41,6 +41,14 @@ class SpaSearchProviderTest { private val pageOwner = spaEnvironment.createPage("SppForSearch") @Test + fun testQueryColumnSetup() { + Truth.assertThat(QueryEnum.SEARCH_STATIC_DATA_QUERY.columnNames) + .containsExactlyElementsIn(QueryEnum.SEARCH_DYNAMIC_DATA_QUERY.columnNames) + Truth.assertThat(QueryEnum.SEARCH_MUTABLE_STATUS_DATA_QUERY.columnNames) + .containsExactlyElementsIn(QueryEnum.SEARCH_IMMUTABLE_STATUS_DATA_QUERY.columnNames) + } + + @Test fun testQuerySearchStatusData() { SpaEnvironmentFactory.reset(spaEnvironment) |