diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-12-08 16:25:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-12-08 16:25:27 +0000 |
| commit | e5bd844eafa7a7879db910b8eeb06915cb412c4f (patch) | |
| tree | 4c823f1e46ada392a2e36bac21b16d0b746b6d6d /core/java | |
| parent | 610e70d8915f99b10475b8247462bac4ecebf6b4 (diff) | |
| parent | e55cd3e84a217793a822bb3300a61bdb3ae1175d (diff) | |
Merge "Revert "Notify AutofillManager in onResume() IFF activity was not recreated.""
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/Activity.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index cfda8037072f..61b9d55a7fa6 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -1723,15 +1723,7 @@ public class Activity extends ContextThemeWrapper if (mAutoFillResetNeeded) { if (!mAutoFillIgnoreFirstResumePause) { View focus = getCurrentFocus(); - // On Activity rotation situation (mRestoredFromBundle is true), - // 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()) { + if (focus != null && focus.canNotifyAutofillEnterExitEvent()) { // TODO: in Activity killed/recreated case, i.e. SessionLifecycleTest# // testDatasetVisibleWhileAutofilledAppIsLifecycled: the View's initial // window visibility after recreation is INVISIBLE in onResume() and next frame |