diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-06-08 10:40:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-08 10:40:17 +0000 |
| commit | 8b6b4752ffbbfb8ede2d325a7487e417f11c695f (patch) | |
| tree | 03ed3561c73c179c4ddc8d95365eb06da3683c0e | |
| parent | 5344f27f2bdea8cd33da83c2b289d5a8f845ced7 (diff) | |
| parent | 8032074e61c0a1bf3c53fd866d66c68e8fcea57c (diff) | |
| download | base-8b6b4752ffbbfb8ede2d325a7487e417f11c695f.tar.gz | |
Merge "Fix AutofillManager NPE" am: 8032074e61
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115080
Change-Id: I13b8fb4699966bfc748b087030f8f25d64bec521
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/view/autofill/AutofillManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/autofill/AutofillManager.java b/core/java/android/view/autofill/AutofillManager.java index d0651472bd16..1c38b3b4c4be 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)); |