Merge "Don't post finishDrawing call on client UI thread." (56f0117e) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+31 −26

Original line number	Diff line number	Diff line
		@@ -675,12 +675,6 @@ public final class ViewRootImpl implements ViewParent,

		private BLASTBufferQueue mBlastBufferQueue;

		/**
		* Transaction object that can be used to synchronize child SurfaceControl changes with
		* ViewRootImpl SurfaceControl changes by the server. The object is passed along with
		* the SurfaceChangedCallback.
		*/
		private final Transaction mSurfaceChangedTransaction = new Transaction();
		/**
		* Child container layer of {@code mSurface} with the same bounds as its parent, and cropped to
		* the surface insets. This surface is created only if a client requests it via {@link
		@@ -2142,9 +2136,9 @@ public final class ViewRootImpl implements ViewParent,
		mSurfaceChangedCallbacks.remove(c);
		}

		private void notifySurfaceCreated() {
		private void notifySurfaceCreated(Transaction t) {
		for (int i = 0; i < mSurfaceChangedCallbacks.size(); i++) {
		mSurfaceChangedCallbacks.get(i).surfaceCreated(mSurfaceChangedTransaction);
		mSurfaceChangedCallbacks.get(i).surfaceCreated(t);
		}
		}

		@@ -2153,9 +2147,9 @@ public final class ViewRootImpl implements ViewParent,
		* called if a new surface is created, only if the valid surface has been replaced with another
		* valid surface.
		*/
		private void notifySurfaceReplaced() {
		private void notifySurfaceReplaced(Transaction t) {
		for (int i = 0; i < mSurfaceChangedCallbacks.size(); i++) {
		mSurfaceChangedCallbacks.get(i).surfaceReplaced(mSurfaceChangedTransaction);
		mSurfaceChangedCallbacks.get(i).surfaceReplaced(t);
		}
		}

		@@ -3511,17 +3505,24 @@ public final class ViewRootImpl implements ViewParent,
		}
		}

		boolean didUseTransaction = false;
		// These callbacks will trigger SurfaceView SurfaceHolder.Callbacks and must be invoked
		// after the measure pass. If its invoked before the measure pass and the app modifies
		// the view hierarchy in the callbacks, we could leave the views in a broken state.
		if (surfaceCreated) {
		notifySurfaceCreated();
		notifySurfaceCreated(mTransaction);
		didUseTransaction = true;
		} else if (surfaceReplaced) {
		notifySurfaceReplaced();
		notifySurfaceReplaced(mTransaction);
		didUseTransaction = true;
		} else if (surfaceDestroyed) {
		notifySurfaceDestroyed();
		}

		if (didUseTransaction) {
		applyTransactionOnDraw(mTransaction);
		}

		if (triggerGlobalLayoutListener) {
		mAttachInfo.mRecomputeGlobalAttributes = false;
		mAttachInfo.mTreeObserver.dispatchOnGlobalLayout();
		@@ -3726,15 +3727,8 @@ public final class ViewRootImpl implements ViewParent,
		final int seqId = mSyncSeqId;
		mWmsRequestSyncGroupState = WMS_SYNC_PENDING;
		mWmsRequestSyncGroup = new SurfaceSyncGroup(t -> {
		mWmsRequestSyncGroupState = WMS_SYNC_RETURNED;
		// Callback will be invoked on executor thread so post to main thread.
		mHandler.postAtFrontOfQueue(() -> {
		if (t != null) {
		mSurfaceChangedTransaction.merge(t);
		}
		mWmsRequestSyncGroupState = WMS_SYNC_MERGED;
		reportDrawFinished(seqId);
		});
		reportDrawFinished(t, seqId);
		});
		if (DEBUG_BLAST) {
		Log.d(mTag, "Setup new sync id=" + mWmsRequestSyncGroup);
		@@ -4397,18 +4391,22 @@ public final class ViewRootImpl implements ViewParent,
		}
		}

		private void reportDrawFinished(int seqId) {
		private void reportDrawFinished(@Nullable Transaction t, int seqId) {
		if (DEBUG_BLAST) {
		Log.d(mTag, "reportDrawFinished " + Debug.getCallers(5));
		Log.d(mTag, "reportDrawFinished");
		}

		try {
		mWindowSession.finishDrawing(mWindow, mSurfaceChangedTransaction, seqId);
		mWindowSession.finishDrawing(mWindow, t, seqId);
		} catch (RemoteException e) {
		Log.e(mTag, "Unable to report draw finished", e);
		mSurfaceChangedTransaction.apply();
		if (t != null) {
		t.apply();
		}
		} finally {
		mSurfaceChangedTransaction.clear();
		if (t != null) {
		t.clear();
		}
		}
		}

		@@ -11336,6 +11334,13 @@ public final class ViewRootImpl implements ViewParent,
		if (!mIsInTraversal && !mTraversalScheduled) {
		scheduleTraversals();
		}
		if (DEBUG_BLAST) {
		Log.d(mTag, "Creating new active sync group " + mActiveSurfaceSyncGroup);
		}
		} else {
		if (DEBUG_BLAST) {
		Log.d(mTag, "Return already created active sync group " + mActiveSurfaceSyncGroup);
		}
		}
		return mActiveSurfaceSyncGroup;
		};

core/java/android/window/SurfaceSyncGroup.java

+19 −1

Original line number	Diff line number	Diff line
		@@ -115,6 +115,9 @@ public class SurfaceSyncGroup {
		public SurfaceSyncGroup() {
		this(transaction -> {
		if (transaction != null) {
		if (DEBUG) {
		Log.d(TAG, "Applying transaction " + transaction);
		}
		transaction.apply();
		}
		});
		@@ -133,6 +136,10 @@ public class SurfaceSyncGroup {
		*/
		public SurfaceSyncGroup(Consumer<Transaction> transactionReadyCallback) {
		mTransactionReadyCallback = transaction -> {
		if (DEBUG && transaction != null) {
		Log.d(TAG,
		"Sending non null transaction " + transaction + " to callback for " + this);
		}
		transactionReadyCallback.accept(transaction);
		synchronized (mLock) {
		for (Pair<Executor, Runnable> callback : mSyncCompleteCallbacks) {
		@@ -238,6 +245,10 @@ public class SurfaceSyncGroup {
		TransactionReadyCallback transactionReadyCallback = new TransactionReadyCallback() {
		@Override
		public void onTransactionReady(Transaction t) {
		if (DEBUG) {
		Log.d(TAG, "onTransactionReady called for" + surfaceSyncGroup + " and sent to "
		+ this);
		}
		synchronized (mLock) {
		if (t != null) {
		// When an older parent sync group is added due to a child syncGroup getting
		@@ -262,7 +273,12 @@ public class SurfaceSyncGroup {
		return false;
		}
		mPendingSyncs.add(transactionReadyCallback);
		if (DEBUG) {
		Log.d(TAG, "addToSync " + surfaceSyncGroup + " to " + this + " mSyncReady="
		+ mSyncReady + " mPendingSyncs=" + mPendingSyncs.size());
		}
		}

		surfaceSyncGroup.onAddedToSyncGroup(this, transactionReadyCallback);
		return true;
		}
		@@ -316,7 +332,9 @@ public class SurfaceSyncGroup {
		// from the original parent are also combined with the new parent SurfaceSyncGroup.
		if (mParentSyncGroup != null && mParentSyncGroup != parentSyncGroup) {
		if (DEBUG) {
		Log.d(TAG, "Already part of sync group " + mParentSyncGroup + " " + this);
		Log.d(TAG, "Trying to add to " + parentSyncGroup
		+ " but already part of sync group " + mParentSyncGroup + " "
		+ this);
		}
		parentSyncGroup.addToSync(mParentSyncGroup, true /* parentSyncGroupMerge */);
		}