Merge "Removed IAutofillManager.updateOrRestartSession() logic." (304fcaf7) · Commits · e / os / android_frameworks_base

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

+2 −22

Original line number	Diff line number	Diff line
		@@ -1582,29 +1582,9 @@ public final class AutofillManager {
		Log.v(TAG, "updateSessionLocked(): id=" + id + ", bounds=" + bounds
		+ ", value=" + value + ", action=" + action + ", flags=" + flags);
		}
		boolean restartIfNecessary = (flags & FLAG_MANUAL_REQUEST) != 0;

		try {
		if (restartIfNecessary) {
		final AutofillClient client = getClient();
		if (client == null) return; // NOTE: getClient() already logd it..

		final int newId = mService.updateOrRestartSession(
		client.autofillClientGetActivityToken(),
		mServiceClient.asBinder(), id, bounds, value, mContext.getUserId(),
		mCallback != null, flags, client.autofillClientGetComponentName(),
		mSessionId, action, isCompatibilityModeEnabledLocked());
		if (newId != mSessionId) {
		if (sDebug) Log.d(TAG, "Session restarted: " + mSessionId + "=>" + newId);
		mSessionId = newId;
		mState = (mSessionId == NO_SESSION) ? STATE_UNKNOWN : STATE_ACTIVE;
		client.autofillClientResetableStateAvailable();
		}
		} else {
		mService.updateSession(mSessionId, id, bounds, value, action, flags,
		mContext.getUserId());
		}

		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

+0 −4

Original line number	Diff line number	Diff line
		@@ -45,10 +45,6 @@ interface IAutoFillManager {
		boolean restoreSession(int sessionId, in IBinder activityToken, in IBinder appCallback);
		void updateSession(int sessionId, in AutofillId id, in Rect bounds,
		in AutofillValue value, int action, int flags, int userId);
		int updateOrRestartSession(IBinder activityToken, in IBinder appCallback,
		in AutofillId autoFillId, in Rect bounds, in AutofillValue value, int userId,
		boolean hasCallback, int flags, in ComponentName componentName, int sessionId,
		int action, boolean compatMode);
		void setAutofillFailure(int sessionId, in List<AutofillId> ids, int userId);
		void finishSession(int sessionId, int userId);
		void cancelSession(int sessionId, int userId);

+0 −24

Original line number	Diff line number	Diff line
		@@ -1063,30 +1063,6 @@ public final class AutofillManagerService extends SystemService {
		}
		}

		@Override
		public int updateOrRestartSession(IBinder activityToken, IBinder appCallback,
		AutofillId autoFillId, Rect bounds, AutofillValue value, int userId,
		boolean hasCallback, int flags, ComponentName componentName, int sessionId,
		int action, boolean compatMode) {
		boolean restart = false;
		synchronized (mLock) {
		final AutofillManagerServiceImpl service = peekServiceForUserLocked(userId);
		if (service != null) {
		restart = service.updateSessionLocked(sessionId, getCallingUid(), autoFillId,
		bounds, value, action, flags);
		} else if (sVerbose) {
		Slog.v(TAG, "updateOrRestartSession(): no service for " + userId);
		}
		}
		if (restart) {
		return startSession(activityToken, appCallback, autoFillId, bounds, value, userId,
		hasCallback, flags, componentName, compatMode);
		}

		// Nothing changed...
		return sessionId;
		}

		@Override
		public void setAutofillFailure(int sessionId, @NonNull List<AutofillId> ids, int userId) {
		synchronized (mLock) {