Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-12-08 16:25:27 +00:00
committed by Android (Google) Code Review
parent 610e70d891 e55cd3e84a
commit e5bd844eaf
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/app/Activity.java
View File

@@ -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