From 21df117d52f414bceea11d5725b98676e5663f02 Mon Sep 17 00:00:00 2001
From: Jerry Shi <sgjerry@google.com>
Date: Tue, 9 May 2023 21:00:32 -0700
Subject: [PATCH] Add null check for settings default preference controller

Test: local built and tested
Bug: 281771729
Change-Id: Ib3467c22262125ac7dac00eb9ea68516ddf53b5a
---
 .../credentials/DefaultCombinedPreferenceController.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/applications/credentials/DefaultCombinedPreferenceController.java b/src/com/android/settings/applications/credentials/DefaultCombinedPreferenceController.java
index 34881ab6703..742faf1758e 100644
--- a/src/com/android/settings/applications/credentials/DefaultCombinedPreferenceController.java
+++ b/src/com/android/settings/applications/credentials/DefaultCombinedPreferenceController.java
@@ -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 =