Merge "Fix NPE in AutofillManager when feature autofill is disabled" am: 782fa90be7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1511471

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f8a8f1370fb9523f8a67b5ccafbe101aa495709
This commit is contained in:
Treehugger Robot
2021-02-23 23:10:15 +00:00
committed by Automerger Merge Worker

View File

@@ -1911,7 +1911,10 @@ public final class AutofillManager {
if (client == null) {
return;
}
if (mService == null) {
Log.w(TAG, "Autofill service is null!");
return;
}
if (mServiceClient == null) {
mServiceClient = new AutofillManagerClient(this);
try {