Merge "Protected the pointer for multiple threads" (ab4081a5) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -324,7 +324,9 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
		+ "mForAugmentedAutofillOnly: %s", mForAugmentedAutofillOnly);
		return;
		}
		if (mCurrentViewId == null) {
		// Keeps to prevent it is cleared on multiple threads.
		final AutofillId currentViewId = mCurrentViewId;
		if (currentViewId == null) {
		Slog.w(TAG, "No current view id - session might have finished");
		return;
		}
		@@ -398,7 +400,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
		if (mContexts == null) {
		mContexts = new ArrayList<>(1);
		}
		mContexts.add(new FillContext(requestId, structure, mCurrentViewId));
		mContexts.add(new FillContext(requestId, structure, currentViewId));

		cancelCurrentRequestLocked();