Merge "Add null check for settings default preference controller" into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
ba44f13498
@@ -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 =
|
||||||
|
|||||||
Reference in New Issue
Block a user