Merge "DO NOT MERGE - Disable warning on blocking one-way call from autofill server." into pi-dev (8c55e8c3) · Commits · e / os / android_frameworks_base

core/java/android/app/assist/AssistStructure.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -2237,6 +2237,22 @@ public class AssistStructure implements Parcelable {
		return mWindowNodes.get(index);
		}

		// TODO(b/35708678): temporary method that disable one-way warning flag on binder.
		/** @hide */
		public void ensureDataForAutofill() {
		if (mHaveData) {
		return;
		}
		mHaveData = true;
		Binder.allowBlocking(mReceiveChannel);
		try {
		ParcelTransferReader reader = new ParcelTransferReader(mReceiveChannel);
		reader.go();
		} finally {
		Binder.defaultBlocking(mReceiveChannel);
		}
		}

		/** @hide */
		public void ensureData() {
		if (mHaveData) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -254,7 +254,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
		// change AssistStructure so it provides a "one-way" writeToParcel() method that
		// sends all the data
		try {
		structure.ensureData();
		structure.ensureDataForAutofill();
		} catch (RuntimeException e) {
		wtf(e, "Exception lazy loading assist structure for %s: %s",
		structure.getActivityComponent(), e);