Merge "Fix ViewRootImpl traversal issue after SurfaceSyncGroup timeout" into main (34daf84e) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+33 −8

Original line number	Diff line number	Diff line
		@@ -6971,9 +6971,7 @@ public final class ViewRootImpl implements ViewParent,
		handleScrollCaptureRequest((IScrollCaptureResponseListener) msg.obj);
		break;
		case MSG_PAUSED_FOR_SYNC_TIMEOUT:
		Log.e(mTag, "Timedout waiting to unpause for sync");
		mNumPausedForSync = 0;
		scheduleTraversals();
		resumeAfterSyncTimeout();
		break;
		case MSG_CHECK_INVALIDATION_IDLE: {
		long delta;
		@@ -12777,6 +12775,15 @@ public final class ViewRootImpl implements ViewParent,
		activeSurfaceSyncGroup.addTransaction(t);
		}

		/**
		* Resume rendering after being paused for sync due to a timeout.
		*/
		private void resumeAfterSyncTimeout() {
		Log.e(mTag, "Timedout waiting to unpause for sync mNumPausedForSync=" + mNumPausedForSync);
		mNumPausedForSync = 0;
		scheduleTraversals();
		}

		@Override
		public SurfaceSyncGroup getOrCreateSurfaceSyncGroup() {
		boolean newSyncGroup = false;
		@@ -12804,6 +12811,16 @@ public final class ViewRootImpl implements ViewParent,
		}
		});
		newSyncGroup = true;

		// If the sync group is marked ready by a timeout, check if rendering is paused and
		// if it is, resume rendering and trigger a traversal.
		mActiveSurfaceSyncGroup.addSyncCompleteCallback(mExecutor, () -> {
		if (mActiveSurfaceSyncGroup != null
		&& mActiveSurfaceSyncGroup.isComplete() && mNumPausedForSync > 0) {
		mHandler.removeMessages(MSG_PAUSED_FOR_SYNC_TIMEOUT);
		resumeAfterSyncTimeout();
		}
		});
		}

		Trace.instant(Trace.TRACE_TAG_VIEW,
		@@ -12818,12 +12835,20 @@ public final class ViewRootImpl implements ViewParent,
		}
		}

		// The sync group can be marked ready by a timeout. This makes incrementing
		// mNumPausedForSync racy. Here we check if the sync group is complete and
		// if it is then we don't pause for syncing.
		if (!mActiveSurfaceSyncGroup.isComplete()) {
		mNumPausedForSync++;
		mHandler.removeMessages(MSG_PAUSED_FOR_SYNC_TIMEOUT);
		mHandler.sendEmptyMessageDelayed(MSG_PAUSED_FOR_SYNC_TIMEOUT,
		1000 * Build.HW_TIMEOUT_MULTIPLIER);
		} else {
		Log.d(mTag, "Active sync group is already completed "
		+ mActiveSurfaceSyncGroup.getName());
		}
		return mActiveSurfaceSyncGroup;
		};
		}

		private final Executor mSimpleExecutor = Runnable::run;

core/java/android/window/SurfaceSyncGroup.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -838,6 +838,16 @@ public final class SurfaceSyncGroup {
		mHandler.postDelayed(runnable, this, TRANSACTION_READY_TIMEOUT);
		}

		/**
		* Returns true if the SurfaceSyncGroup has completed its sync.
		* @hide
		*/
		public boolean isComplete() {
		synchronized (mLock) {
		return mFinished;
		}
		}

		/**
		* A frame callback that is used to synchronize SurfaceViews. The owner of the SurfaceView must
		* implement onFrameStarted when trying to sync the SurfaceView. This is to ensure the sync