Merge "Do not show UI when currentID changed." into oc-dev (ff5eb06e) · Commits · e / os / android_frameworks_base

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

+16 −6

Original line number	Diff line number	Diff line
		@@ -311,13 +311,23 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
		@Override
		public void requestShowFillUi(AutofillId id, int width, int height,
		IAutofillWindowPresenter presenter) {
		synchronized (mLock) {
		if (id.equals(mCurrentViewId)) {
		try {
		final ViewState currentView = mViewStates.get(mCurrentViewId);
		final ViewState view = mViewStates.get(id);
		mClient.requestShowFillUi(mWindowToken, id, width, height,
		currentView.getVirtualBounds(), presenter);
		view.getVirtualBounds(),
		presenter);
		} catch (RemoteException e) {
		Slog.e(TAG, "Error requesting to show fill UI", e);
		}
		} else {
		if (DEBUG) {
		Slog.d(TAG, "Do not show full UI on " + id + " as it is not the current view ("
		+ mCurrentViewId + ") anymore");
		}
		}
		}
		}

		// AutoFillUiCallback