From 1c53e50cf3f0cc60f1bfbda6ce7cad18a0cc0c6f Mon Sep 17 00:00:00 2001
From: jiajia tang <tangjiajia@xiaomi.com>
Date: Wed, 8 Jun 2022 08:20:37 +0800
Subject: [PATCH] Fix AutofillManager NPE

Bug: 228529893

Change-Id: I2de34b24752eed089ca5d1e34d216c87dc3bf2c6
Signed-off-by: jiajia tang <tangjiajia@xiaomi.com>
Merged-In: If56d690882e8d4ad0dba1534f127478089c4d04f
---
 core/java/android/view/autofill/AutofillManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java
index d0651472bd163..1c38b3b4c4bef 100644
--- a/core/java/android/view/autofill/AutofillManager.java
+++ b/core/java/android/view/autofill/AutofillManager.java
@@ -1795,7 +1795,7 @@ public final class AutofillManager {
             if (newClientState != null) {
                 responseData.putBundle(EXTRA_CLIENT_STATE, newClientState);
             }
-            if (data.getExtras().containsKey(EXTRA_AUTHENTICATION_RESULT_EPHEMERAL_DATASET)) {
+            if (data.hasExtra(EXTRA_AUTHENTICATION_RESULT_EPHEMERAL_DATASET)) {
                 responseData.putBoolean(EXTRA_AUTHENTICATION_RESULT_EPHEMERAL_DATASET,
                         data.getBooleanExtra(EXTRA_AUTHENTICATION_RESULT_EPHEMERAL_DATASET,
                                 false));