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

Merge "Notify AutofillManager that activity is finishing on onDestroy()."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-09-26 03:49:46 +00:00
committed by Android (Google) Code Review
parent 8dcf873d9a c054c5d4a0
commit cb364f996f
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2477,17 +2477,13 @@ public class Activity extends ContextThemeWrapper
getAutofillManager().onInvisibleForAutofill();
}
if (isFinishing()) {
if (mAutoFillResetNeeded) {
getAutofillManager().onActivityFinishing();
} else if (mIntent != null
&& mIntent.hasExtra(AutofillManager.EXTRA_RESTORE_SESSION_TOKEN)) {
// Activity was launched when user tapped a link in the Autofill Save UI - since
// user launched another activity, the Save UI should not be restored when this
// activity is finished.
getAutofillManager().onPendingSaveUi(AutofillManager.PENDING_UI_OPERATION_CANCEL,
mIntent.getIBinderExtra(AutofillManager.EXTRA_RESTORE_SESSION_TOKEN));
}
if (isFinishing() && !mAutoFillResetNeeded && mIntent != null
&& mIntent.hasExtra(AutofillManager.EXTRA_RESTORE_SESSION_TOKEN)) {
// Activity was launched when user tapped a link in the Autofill Save UI - since
// user launched another activity, the Save UI should not be restored when this
// activity is finished.
getAutofillManager().onPendingSaveUi(AutofillManager.PENDING_UI_OPERATION_CANCEL,
mIntent.getIBinderExtra(AutofillManager.EXTRA_RESTORE_SESSION_TOKEN));
}
mEnterAnimationComplete = false;
}
@@ -2525,6 +2521,10 @@ public class Activity extends ContextThemeWrapper
if (DEBUG_LIFECYCLE) Slog.v(TAG, "onDestroy " + this);
mCalled = true;
if (isFinishing() && mAutoFillResetNeeded) {
getAutofillManager().onActivityFinishing();
}
// dismiss any dialogs we are managing.
if (mManagedDialogs != null) {
final int numDialogs = mManagedDialogs.size();