Merge "Fix NPE in AutofillManager when feature autofill is disabled"

2021-02-22 17:37:55 +00:00
parent 32a2e39563 3218ac8864
commit 782fa90be7
1 changed files with 4 additions and 1 deletions
--- a/core/java/android/view/autofill/AutofillManager.java
+++ b/core/java/android/view/autofill/AutofillManager.java
@@ -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 {