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

Commit e55cd3e8 authored by Ben Lin's avatar Ben Lin
Browse files

Revert "Notify AutofillManager in onResume() IFF activity was not recreated." 

This reverts commit e579033d.

Reason for revert: b/120160981, broke CTS

Bug: 120160981
Change-Id: I2caa58b155e24281ae02f96dc9c54458df15fc5a
parent e579033d

core/java/android/app/Activity.java

+1 −9
Original line number Original line Diff line number Diff line
@@ -1387,15 +1387,7 @@ public class Activity extends ContextThemeWrapper 
        if (mAutoFillResetNeeded) {

        if (mAutoFillResetNeeded) {

            if (!mAutoFillIgnoreFirstResumePause) {

            if (!mAutoFillIgnoreFirstResumePause) {

                View focus = getCurrentFocus();

                View focus = getCurrentFocus();

                // On Activity rotation situation (mRestoredFromBundle is true),

                if (focus != null && focus.canNotifyAutofillEnterExitEvent()) {

                // we should not call on AutofillManager in onResume()

                // since the next Layout pass will do that.

                // However, there are both cases where Activity#getCurrentFocus()

                // will return null (window not preserved) and not null (window IS

                // preserved), so we need to explicitly check for mRestoredFromBundle

                // here.

                if (!mRestoredFromBundle && focus != null

                        && focus.canNotifyAutofillEnterExitEvent()) {

                    // TODO: in Activity killed/recreated case, i.e. SessionLifecycleTest#

                    // TODO: in Activity killed/recreated case, i.e. SessionLifecycleTest#

                    // testDatasetVisibleWhileAutofilledAppIsLifecycled: the View's initial

                    // testDatasetVisibleWhileAutofilledAppIsLifecycled: the View's initial

                    // window visibility after recreation is INVISIBLE in onResume() and next frame

                    // window visibility after recreation is INVISIBLE in onResume() and next frame