Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b6b4752 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix AutofillManager NPE" am: 8032074e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115080



Change-Id: I13b8fb4699966bfc748b087030f8f25d64bec521
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5344f27f 8032074e

core/java/android/view/autofill/AutofillManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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));