From 3218ac886406719214a3f6a4a9656731011171c6 Mon Sep 17 00:00:00 2001
From: Artem Radchenko <artem.radchenko@globallogic.com>
Date: Thu, 26 Nov 2020 15:47:36 +0200
Subject: [PATCH] Fix NPE in AutofillManager when feature autofill is disabled

When feature_autofill is not present on device IAutoFillManager service could be null.
It is proposed to check service for null before trying to add client to prevent NPE.

Bug: 174444980
Test: cts-tradefed run cts-dev -m CtsWidgetTestCases \
    -t android.widget.cts.DatePickerTest#testPartsVisibilityInSpinnerMode
Signed-off-by: Artem Radchenko <artem.radchenko@globallogic.com>
Change-Id: Id6bad7e652452343ed674e4a7452a1b8231f72c5
Merged-In: I10ce988603f47117d0efddcc014ec51b72d3b3b4
---
 core/java/android/view/autofill/AutofillManager.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java
index c5ca886056331..8810814849b22 100644
--- 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 {