Merge "Removing refresh_rate_voting_telemetry" into main (b109c170) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/feature/DisplayManagerFlags.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -122,11 +122,6 @@ public class DisplayManagerFlags {
		Flags.FLAG_ALWAYS_ROTATE_DISPLAY_DEVICE,
		Flags::alwaysRotateDisplayDevice);

		private final FlagState mRefreshRateVotingTelemetry = new FlagState(
		Flags.FLAG_REFRESH_RATE_VOTING_TELEMETRY,
		Flags::refreshRateVotingTelemetry
		);

		private final FlagState mPixelAnisotropyCorrectionEnabled = new FlagState(
		Flags.FLAG_ENABLE_PIXEL_ANISOTROPY_CORRECTION,
		Flags::enablePixelAnisotropyCorrection
		@@ -403,10 +398,6 @@ public class DisplayManagerFlags {
		return mAlwaysRotateDisplayDevice.isEnabled();
		}

		public boolean isRefreshRateVotingTelemetryEnabled() {
		return mRefreshRateVotingTelemetry.isEnabled();
		}

		public boolean isPixelAnisotropyCorrectionInLogicalDisplayEnabled() {
		return mPixelAnisotropyCorrectionEnabled.isEnabled();
		}
		@@ -626,7 +617,6 @@ public class DisplayManagerFlags {
		pw.println(" " + mAutoBrightnessModesFlagState);
		pw.println(" " + mFastHdrTransitions);
		pw.println(" " + mAlwaysRotateDisplayDevice);
		pw.println(" " + mRefreshRateVotingTelemetry);
		pw.println(" " + mPixelAnisotropyCorrectionEnabled);
		pw.println(" " + mSensorBasedBrightnessThrottling);
		pw.println(" " + mIdleScreenRefreshRateTimeout);

services/core/java/com/android/server/display/feature/display_flags.aconfig

+0 −8

Original line number	Diff line number	Diff line
		@@ -190,14 +190,6 @@ flag {
		}
		}

		flag {
		name: "refresh_rate_voting_telemetry"
		namespace: "display_manager"
		description: "Feature flag for enabling telemetry for refresh rate voting in DisplayManager"
		bug: "310029108"
		is_fixed_read_only: true
		}

		flag {
		name: "enable_pixel_anisotropy_correction"
		namespace: "display_manager"

services/core/java/com/android/server/display/mode/DisplayModeDirector.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -229,8 +229,7 @@ public class DisplayModeDirector {
		mContext = context;
		mHandler = new DisplayModeDirectorHandler(handler.getLooper());
		mInjector = injector;
		mVotesStatsReporter = injector.getVotesStatsReporter(
		displayManagerFlags.isRefreshRateVotingTelemetryEnabled());
		mVotesStatsReporter = injector.getVotesStatsReporter();
		mSupportedModesByDisplay = new SparseArray<>();
		mAppSupportedModesByDisplay = new SparseArray<>();
		mDefaultModeByDisplay = new SparseArray<>();
		@@ -3141,7 +3140,7 @@ public class DisplayModeDirector {
		SensorManagerInternal getSensorManagerInternal();

		@Nullable
		VotesStatsReporter getVotesStatsReporter(boolean refreshRateVotingTelemetryEnabled);
		VotesStatsReporter getVotesStatsReporter();
		}

		@VisibleForTesting
		@@ -3281,10 +3280,9 @@ public class DisplayModeDirector {
		}

		@Override
		public VotesStatsReporter getVotesStatsReporter(boolean refreshRateVotingTelemetryEnabled) {
		public VotesStatsReporter getVotesStatsReporter() {
		// if frame rate override supported, renderRates will be ignored in mode selection
		return new VotesStatsReporter(supportsFrameRateOverride(),
		refreshRateVotingTelemetryEnabled);
		return new VotesStatsReporter(supportsFrameRateOverride());
		}

		private DisplayManager getDisplayManager() {

services/core/java/com/android/server/display/mode/VotesStatsReporter.java

+8 −17

Original line number	Diff line number	Diff line
		@@ -36,13 +36,11 @@ class VotesStatsReporter {
		private static final String TAG = "VotesStatsReporter";
		private static final int REFRESH_RATE_NOT_LIMITED = 1000;
		private final boolean mIgnoredRenderRate;
		private final boolean mFrameworkStatsLogReportingEnabled;

		private int mLastMinPriorityReported = Vote.MAX_PRIORITY + 1;

		public VotesStatsReporter(boolean ignoreRenderRate, boolean refreshRateVotingTelemetryEnabled) {
		VotesStatsReporter(boolean ignoreRenderRate) {
		mIgnoredRenderRate = ignoreRenderRate;
		mFrameworkStatsLogReportingEnabled = refreshRateVotingTelemetryEnabled;
		}

		void reportVoteChanged(int displayId, int priority, @Nullable Vote vote) {
		@@ -57,29 +55,22 @@ class VotesStatsReporter {
		int maxRefreshRate = getMaxRefreshRate(vote, mIgnoredRenderRate);
		Trace.traceCounter(Trace.TRACE_TAG_POWER,
		TAG + "." + displayId + ":" + Vote.priorityToString(priority), maxRefreshRate);
		if (mFrameworkStatsLogReportingEnabled) {
		FrameworkStatsLog.write(
		DISPLAY_MODE_DIRECTOR_VOTE_CHANGED, displayId, priority,
		DISPLAY_MODE_DIRECTOR_VOTE_CHANGED__VOTE_STATUS__STATUS_ADDED,
		maxRefreshRate, -1);
		}
		}

		private void reportVoteRemoved(int displayId, int priority) {
		Trace.traceCounter(Trace.TRACE_TAG_POWER,
		TAG + "." + displayId + ":" + Vote.priorityToString(priority), -1);
		if (mFrameworkStatsLogReportingEnabled) {
		FrameworkStatsLog.write(
		DISPLAY_MODE_DIRECTOR_VOTE_CHANGED, displayId, priority,
		DISPLAY_MODE_DIRECTOR_VOTE_CHANGED__VOTE_STATUS__STATUS_REMOVED, -1, -1);
		}
		}

		void reportVotesActivated(int displayId, int minPriority, @Nullable Display.Mode baseMode,
		SparseArray<Vote> votes) {
		if (!mFrameworkStatsLogReportingEnabled) {
		return;
		}
		int selectedRefreshRate = baseMode != null ? (int) baseMode.getRefreshRate() : -1;
		for (int priority = Vote.MIN_PRIORITY; priority <= Vote.MAX_PRIORITY; priority++) {
		if (priority < mLastMinPriorityReported && priority < minPriority) {

services/tests/displayservicetests/src/com/android/server/display/mode/DisplayModeDirectorTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -3962,7 +3962,7 @@ public class DisplayModeDirectorTest {
		}

		@Override
		public VotesStatsReporter getVotesStatsReporter(boolean refreshRateVotingTelemetryEnabled) {
		public VotesStatsReporter getVotesStatsReporter() {
		return null;
		}