Add EntryProvider in SettingsGoogle
Bug: 244122804
Test: manual - build SettingsGoogle
Change-Id: I8232361633698f4186c0fda12fb44f221426db9c
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e368d09..1f7e037 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4579,6 +4579,13 @@
<activity android:name=".spa.SpaActivity" android:exported="false"/>
<activity android:name=".spa.SpaBridgeActivity" android:exported="false"/>
+ <activity android:name=".spa.SpaDebugActivity" android:exported="false"/>
+ <provider
+ android:name=".spa.SpaEntryProvider"
+ android:authorities="com.android.settings.spa.provider"
+ android:enabled="true"
+ android:exported="false">
+ </provider>
<activity-alias android:name="UsageStatsActivity"
android:exported="true"
@@ -4593,11 +4600,6 @@
</activity-alias>
<activity
- android:name="com.android.settings.spa.SpaDebugActivity"
- android:exported="false">
- </activity>
-
- <activity
android:name="com.android.settings.applications.mobilebundledapps.MobileBundledAppDetailsActivity"
android:label="@string/mobile_bundled_apps_details_title"
android:exported="true"
diff --git a/src/com/android/settings/spa/SpaDebugActivity.kt b/src/com/android/settings/spa/SpaDebugActivity.kt
index 40fe1d5..d9a4add 100644
--- a/src/com/android/settings/spa/SpaDebugActivity.kt
+++ b/src/com/android/settings/spa/SpaDebugActivity.kt
@@ -18,5 +18,8 @@
import com.android.settingslib.spa.framework.DebugActivity
-class SpaDebugActivity :
- DebugActivity(SpaEnvironment.settingsEntryRepository, SpaActivity::class.java)
+class SpaDebugActivity : DebugActivity(
+ SpaEnvironment.settingsEntryRepository,
+ browseActivityClass = SpaActivity::class.java,
+ entryProviderAuthorities = "com.android.settings.spa.provider",
+)
diff --git a/src/com/android/settings/spa/SpaEntryProvider.kt b/src/com/android/settings/spa/SpaEntryProvider.kt
new file mode 100644
index 0000000..5fa7f56
--- /dev/null
+++ b/src/com/android/settings/spa/SpaEntryProvider.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.spa
+
+import com.android.settingslib.spa.framework.EntryProvider
+
+class SpaEntryProvider : EntryProvider(
+ SpaEnvironment.settingsEntryRepository,
+ browseActivityClass = SpaActivity::class.java,
+)