From 120158529806d7e6e4876fd9247ca6751ee5caf3 Mon Sep 17 00:00:00 2001 From: Quick Date: Fri, 27 Dec 2024 14:29:50 +0900 Subject: [PATCH] Settings: Add PixelLauncher to allowlist for settings search * Adapt to kotlin. Co-authored-by: Joey Huab --- .../android/settings/search/SearchFeatureProviderImpl.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/search/SearchFeatureProviderImpl.kt b/src/com/android/settings/search/SearchFeatureProviderImpl.kt index b1378ab16b9..d7e3b2031a6 100644 --- a/src/com/android/settings/search/SearchFeatureProviderImpl.kt +++ b/src/com/android/settings/search/SearchFeatureProviderImpl.kt @@ -40,9 +40,11 @@ open class SearchFeatureProviderImpl : SearchFeatureProvider { "ExternalSettingsTrampoline intents must be called with startActivityForResult" } val isSettingsPackage = callerPackage == context.packageName - if (isSettingsPackage || - callerPackage == getSettingsIntelligencePkgName(context) || - isSignatureAllowlisted(context, callerPackage)) { + val isAllowlistedPackage = isSignatureAllowlisted(context, callerPackage) || + callerPackage == "com.google.android.apps.nexuslauncher" + + if (isSettingsPackage || isAllowlistedPackage || + callerPackage == getSettingsIntelligencePkgName(context)) { return } throw SecurityException(