Merge "Revert "Add the expected and actual frame duration to the SF jan..."" into main (94cfa1aa) · Commits · e / os / android_frameworks_native

libs/gui/aidl/android/gui/JankData.aidl

+1 −11

Original line number	Diff line number	Diff line
		@@ -29,17 +29,7 @@ parcelable JankData {
		int jankType;

		/**
		* Time between frames in nanoseconds.
		* Expected duration in nanoseconds of this frame.
		*/
		long frameIntervalNs;

		/**
		* Time allocated to the application to render this frame.
		*/
		long scheduledAppFrameTimeNs;

		/**
		* Time taken by the application to render this frame.
		*/
		long actualAppFrameTimeNs;
		}

+0 −17

Original line number	Diff line number	Diff line
		@@ -697,23 +697,6 @@ void SurfaceFrame::onPresent(nsecs_t presentTime, int32_t displayFrameJankType,
		jd.jankType = mJankType;
		jd.frameIntervalNs =
		(mRenderRate ? *mRenderRate : mDisplayFrameRenderRate).getPeriodNsecs();

		if (mPredictionState == PredictionState::Valid) {
		jd.scheduledAppFrameTimeNs = mPredictions.endTime - mPredictions.startTime;

		// Using expected start, rather than actual, to measure the entire frame time. That is
		// if the application starts the frame later than scheduled, include that delay in the
		// frame time, as it usually means main thread being busy with non-rendering work.
		if (mPresentState == PresentState::Dropped) {
		jd.actualAppFrameTimeNs = mDropTime - mPredictions.startTime;
		} else {
		jd.actualAppFrameTimeNs = mActuals.endTime - mPredictions.startTime;
		}
		} else {
		jd.scheduledAppFrameTimeNs = 0;
		jd.actualAppFrameTimeNs = 0;
		}

		JankTracker::onJankData(mLayerId, jd);
		}
		}