Merge "Fix NPE in AutofillManager when feature autofill is disabled" into sc-dev

2021-02-23 03:03:11 +00:00
parent 9def525556 134d041153
commit 3278c403c7
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
@@ -1975,7 +1975,10 @@ public final class AutofillManager {
        if (client == null) {
            return false;
        }
-
+        if (mService == null) {
+            Log.w(TAG, "Autofill service is null!");
+            return false;
+        }
        if (mServiceClient == null) {
            mServiceClient = new AutofillManagerClient(this);
            try {