Merge "Notify AutofillManager that activity is finishing on onDestroy()." (cb364f99) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+11 −11

Original line number	Original line	Diff line number	Diff line
	@@ -2477,10 +2477,7 @@ public class Activity extends ContextThemeWrapper
	getAutofillManager().onInvisibleForAutofill();		getAutofillManager().onInvisibleForAutofill();
	}		}

	if (isFinishing()) {		if (isFinishing() && !mAutoFillResetNeeded && mIntent != null
	if (mAutoFillResetNeeded) {
	getAutofillManager().onActivityFinishing();
	} else if (mIntent != null
	&& mIntent.hasExtra(AutofillManager.EXTRA_RESTORE_SESSION_TOKEN)) {		&& mIntent.hasExtra(AutofillManager.EXTRA_RESTORE_SESSION_TOKEN)) {
	// Activity was launched when user tapped a link in the Autofill Save UI - since		// 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		// user launched another activity, the Save UI should not be restored when this
	@@ -2488,7 +2485,6 @@ public class Activity extends ContextThemeWrapper
	getAutofillManager().onPendingSaveUi(AutofillManager.PENDING_UI_OPERATION_CANCEL,		getAutofillManager().onPendingSaveUi(AutofillManager.PENDING_UI_OPERATION_CANCEL,
	mIntent.getIBinderExtra(AutofillManager.EXTRA_RESTORE_SESSION_TOKEN));		mIntent.getIBinderExtra(AutofillManager.EXTRA_RESTORE_SESSION_TOKEN));
	}		}
	}
	mEnterAnimationComplete = false;		mEnterAnimationComplete = false;
	}		}

	@@ -2525,6 +2521,10 @@ public class Activity extends ContextThemeWrapper
	if (DEBUG_LIFECYCLE) Slog.v(TAG, "onDestroy " + this);		if (DEBUG_LIFECYCLE) Slog.v(TAG, "onDestroy " + this);
	mCalled = true;		mCalled = true;

			if (isFinishing() && mAutoFillResetNeeded) {
			getAutofillManager().onActivityFinishing();
			}

	// dismiss any dialogs we are managing.		// dismiss any dialogs we are managing.
	if (mManagedDialogs != null) {		if (mManagedDialogs != null) {
	final int numDialogs = mManagedDialogs.size();		final int numDialogs = mManagedDialogs.size();