From 74d81b8f9d46de9ef737b796884cce2625e3a828 Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Mon, 6 May 2019 09:57:37 -0700
Subject: [PATCH] Fixed NPE when AutofillManager.getClient() returns null.

Test: atest CtsContentCaptureServiceTestCases # sanity check, issue is not easily reproducible

Fixes: 131924763

Change-Id: I5785a0b03eb1bc73b4e5d3a8da6e044dafac3012
---
 core/java/android/view/autofill/AutofillManager.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java
index 5872d3f7f7852..fdceaac36ed60 100644
--- a/core/java/android/view/autofill/AutofillManager.java
+++ b/core/java/android/view/autofill/AutofillManager.java
@@ -3212,7 +3212,12 @@ public final class AutofillManager {
             final AutofillManager afm = mAfm.get();
             if (afm == null) return null;
 
-            final View view = afm.getClient().autofillClientFindViewByAutofillIdTraversal(id);
+            final AutofillClient client = afm.getClient();
+            if (client == null) {
+                Log.w(TAG, "getViewCoordinates(" + id + "): no autofill client");
+                return null;
+            }
+            final View view = client.autofillClientFindViewByAutofillIdTraversal(id);
             if (view == null) {
                 Log.w(TAG, "getViewCoordinates(" + id + "): could not find view");
                 return null;