PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ica8ac64f4e85934d11e556ff214db60afa75b8e4
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:14:54 +00:00
committed by Automerger Merge Worker
parent 2bf036e61c ba44f13498
commit c93df29409
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/applications/credentials/DefaultCombinedPreferenceController.java
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 =