Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498 am: 8e70a25893

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101

Change-Id: I312a5f5d30b89205938d43567a1a6946a46bc6d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Guangjie (Jerry) Shi
2023-05-10 07:15:30 +00:00
committed by Automerger Merge Worker

View File

@@ -156,7 +156,7 @@ public class DefaultCombinedPreferenceController extends DefaultAppPreferenceCon
final ServiceInfo serviceInfo = resolveInfo.serviceInfo;
// If there are multiple autofill services then pick the first one.
if (mKey.startsWith(serviceInfo.packageName)) {
if (mKey != null && mKey.startsWith(serviceInfo.packageName)) {
final String settingsActivity;
try {
settingsActivity =