Merge "Add null check for settings default preference controller" into udc-dev

This commit is contained in:
Guangjie (Jerry) Shi
2023-05-10 06:30:37 +00:00
committed by Android (Google) Code Review

View File

@@ -156,7 +156,7 @@ public class DefaultCombinedPreferenceController extends DefaultAppPreferenceCon
final ServiceInfo serviceInfo = resolveInfo.serviceInfo; final ServiceInfo serviceInfo = resolveInfo.serviceInfo;
// If there are multiple autofill services then pick the first one. // 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; final String settingsActivity;
try { try {
settingsActivity = settingsActivity =