Merge "Checks if mResponses is null before using it." into oc-mr1-dev (e2359f21) · Commits · e / os / android_frameworks_base

core/java/android/view/autofill/AutofillManager.java

+14 −4

Original line number	Original line	Diff line number	Diff line
	@@ -694,8 +694,13 @@ public final class AutofillManager {
	/**		/**
	* Called to indicate the current autofill context should be commited.		* Called to indicate the current autofill context should be commited.
	*		*
	* <p>For example, when a virtual view is rendering an {@code HTML} page with a form, it should		* <p>This method is typically called by {@link View Views} that manage virtual views; for
	* call this method after the form is submitted and another page is rendered.		* example, when the view is rendering an {@code HTML} page with a form and virtual views
			* that represent the HTML elements, it should call this method after the form is submitted and
			* another page is rendered.
			*
			* <p><b>Note:</b> This method does not need to be called on regular application lifecycle
			* methods such as {@link android.app.Activity#finish()}.
	*/		*/
	public void commit() {		public void commit() {
	if (!hasAutofillFeature()) {		if (!hasAutofillFeature()) {
	@@ -713,8 +718,13 @@ public final class AutofillManager {
	/**		/**
	* Called to indicate the current autofill context should be cancelled.		* Called to indicate the current autofill context should be cancelled.
	*		*
	* <p>For example, when a virtual view is rendering an {@code HTML} page with a form, it should		* <p>This method is typically called by {@link View Views} that manage virtual views; for
	* call this method if the user does not post the form but moves to another form in this page.		* example, when the view is rendering an {@code HTML} page with a form and virtual views
			* that represent the HTML elements, it should call this method if the user does not post the
			* form but moves to another form in this page.
			*
			* <p><b>Note:</b> This method does not need to be called on regular application lifecycle
			* methods such as {@link android.app.Activity#finish()}.
	*/		*/
	public void cancel() {		public void cancel() {
	if (!hasAutofillFeature()) {		if (!hasAutofillFeature()) {

services/autofill/java/com/android/server/autofill/Session.java

+16 −8

Original line number	Original line	Diff line number	Diff line
	@@ -715,7 +715,13 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
	+ id + " destroyed");		+ id + " destroyed");
	return;		return;
	}		}
			if (mResponses == null) {
			// Typically happens when app explicitly called cancel() while the service was showing
			// the auth UI.
			Slog.w(TAG, "setAuthenticationResultLocked(" + authenticationId + "): no responses");
			removeSelf();
			return;
			}
	final int requestId = AutofillManager.getRequestIdFromAuthenticationId(authenticationId);		final int requestId = AutofillManager.getRequestIdFromAuthenticationId(authenticationId);
	final FillResponse authenticatedResponse = mResponses.get(requestId);		final FillResponse authenticatedResponse = mResponses.get(requestId);
	if (authenticatedResponse == null \|\| data == null) {		if (authenticatedResponse == null \|\| data == null) {
	@@ -781,7 +787,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
	return true;		return true;
	}		}

	final int lastResponseIdx = getLastResponseIndex();		final int lastResponseIdx = getLastResponseIndexLocked();
	if (lastResponseIdx < 0) {		if (lastResponseIdx < 0) {
	Slog.w(TAG, "showSaveLocked(): did not get last response. mResponses=" + mResponses		Slog.w(TAG, "showSaveLocked(): did not get last response. mResponses=" + mResponses
	+ ", mViewStates=" + mViewStates);		+ ", mViewStates=" + mViewStates);
	@@ -1265,7 +1271,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState

	// Only track the views of the last response as only those are reported back to the		// Only track the views of the last response as only those are reported back to the
	// service, see #showSaveLocked		// service, see #showSaveLocked
	final FillResponse response = mResponses.valueAt(getLastResponseIndex());		final FillResponse response = mResponses.valueAt(getLastResponseIndexLocked());

	ArraySet<AutofillId> trackedViews = null;		ArraySet<AutofillId> trackedViews = null;
	boolean saveOnAllViewsInvisible = false;		boolean saveOnAllViewsInvisible = false;
	@@ -1642,19 +1648,21 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
	}		}
	}		}

	private int getLastResponseIndex() {		private int getLastResponseIndexLocked() {
	// The response ids are monotonically increasing so		// The response ids are monotonically increasing so
	// we just find the largest id which is the last. We		// we just find the largest id which is the last. We
	// do not rely on the internal ordering in sparse		// do not rely on the internal ordering in sparse
	// array to avoid - wow this stopped working!?		// array to avoid - wow this stopped working!?
	int lastResponseIdx = -1;		int lastResponseIdx = -1;
	int lastResponseId = -1;		int lastResponseId = -1;
			if (mResponses != null) {
	final int responseCount = mResponses.size();		final int responseCount = mResponses.size();
	for (int i = 0; i < responseCount; i++) {		for (int i = 0; i < responseCount; i++) {
	if (mResponses.keyAt(i) > lastResponseId) {		if (mResponses.keyAt(i) > lastResponseId) {
	lastResponseIdx = i;		lastResponseIdx = i;
	}		}
	}		}
			}
	return lastResponseIdx;		return lastResponseIdx;
	}		}
	}		}