commit 7c8c031982cf47dabd7ed987cbf55c88afe808e9
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Aug 23 15:33:08 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 23 15:33:08 2023 +0000
tree d54698e45e37ce82374671cb5aa7683f2a430011
parent 09461d20e37de46412f294561e5e798984c019fc
parent d325f170e0e62b45e325ae4aeb8ed790b2e27524

Merge "Fix permissions xml and provider access" into main

Android.bp

diff --git a/Android.bp b/Android.bp
index b8dcbe5..b4c1b32 100644
--- a/Android.bp
+++ b/Android.bp
@@ -127,5 +127,5 @@
     platform_apis: true,
     manifest: "AndroidManifest.xml",
     additional_manifests: [":WallpaperPicker2_Manifest"],
-    overrides: ["WallpaperPicker2"],
+    overrides: ["WallpaperPicker", "WallpaperPicker2"],
 }

src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt

diff --git a/src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt b/src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt
index 05b0916..9e232d7 100644
--- a/src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt
+++ b/src/com/android/customization/picker/color/ui/binder/ColorSectionViewBinder.kt
@@ -95,7 +95,7 @@
                 LayoutInflater.from(view.context)
                     .inflate(R.layout.color_option_no_background, view, false)
             item.payload?.let { ColorOptionIconBinder.bind(itemView as ViewGroup, item.payload) }
-            val optionSelectedView = itemView.findViewById<ImageView>(R.id.option_selected)
+            val optionSelectedView = itemView.requireViewById<ImageView>(R.id.option_selected)
 
             lifecycleOwner.lifecycleScope.launch {
                 lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {