Merge "Add null check for settings default preference controller" into udc-dev am: ba44f13498
am: 8e70a25893
am: 02f56a627a
am: 15eb2fd250
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23127101 Change-Id: Ie547fcc52b468e91ea35ab2b3596cc561b2f3ddb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
committed by
Automerger Merge Worker
commit
a38a249fda
@@ -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 =
|
||||
|
Reference in New Issue
Block a user