Merge changes from topic "preferredDisplayModeId60120" into sc-dev (c49b886d) · Commits · e / os / android_frameworks_base

core/java/android/hardware/display/DisplayManagerInternal.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -190,6 +190,8 @@ public abstract class DisplayManagerInternal {
		* has a preference.
		* @param requestedModeId The preferred mode id for the top-most visible window that has a
		* preference.
		* @param requestedMaxRefreshRate The preferred highest refresh rate for the top-most visible
		* window that has a preference.
		* @param requestedMinimalPostProcessing The preferred minimal post processing setting for the
		* display. This is true when there is at least one visible window that wants minimal post
		* processng on.
		@@ -197,8 +199,8 @@ public abstract class DisplayManagerInternal {
		* prior to call to performTraversalInTransactionFromWindowManager.
		*/
		public abstract void setDisplayProperties(int displayId, boolean hasContent,
		float requestedRefreshRate, int requestedModeId, boolean requestedMinimalPostProcessing,
		boolean inTraversal);
		float requestedRefreshRate, int requestedModeId, float requestedMaxRefreshRate,
		boolean requestedMinimalPostProcessing, boolean inTraversal);

		/**
		* Applies an offset to the contents of a display, for example to avoid burn-in.

core/java/android/view/WindowManager.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -3009,6 +3009,14 @@ public interface WindowManager extends ViewManager {
		*/
		public int preferredDisplayModeId;

		/**
		* The max display refresh rate while the window is in focus.
		*
		* This value is ignored if {@link #preferredDisplayModeId} is set.
		* @hide
		*/
		public float preferredMaxDisplayRefreshRate;

		/**
		* An internal annotation for flags that can be specified to {@link #systemUiVisibility}
		* and {@link #subtreeSystemUiVisibility}.

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java

+8 −14

Original line number	Diff line number	Diff line
		@@ -61,7 +61,6 @@ import java.io.PrintWriter;
		import java.lang.ref.WeakReference;
		import java.lang.reflect.Field;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.HashSet;
		import java.util.Set;
		import java.util.function.Consumer;
		@@ -85,7 +84,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
		private final LayoutParams mLpChanged;
		private final boolean mKeyguardScreenRotation;
		private final long mLockScreenDisplayTimeout;
		private final Display.Mode mKeyguardDisplayMode;
		private final float mKeyguardRefreshRate;
		private final KeyguardViewMediator mKeyguardViewMediator;
		private final KeyguardBypassController mKeyguardBypassController;
		private ViewGroup mNotificationShadeView;
		@@ -135,14 +134,8 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
		// Running on the highest frame rate available can be expensive.
		// Let's specify a preferred refresh rate, and allow higher FPS only when we
		// know that we're not falsing (because we unlocked.)
		int keyguardRefreshRate = context.getResources()
		mKeyguardRefreshRate = context.getResources()
		.getInteger(R.integer.config_keyguardRefreshRate);
		// Find supported display mode with the same resolution and requested refresh rate.
		mKeyguardDisplayMode = Arrays.stream(supportedModes).filter(mode ->
		(int) mode.getRefreshRate() == keyguardRefreshRate
		&& mode.getPhysicalWidth() == currentMode.getPhysicalWidth()
		&& mode.getPhysicalHeight() == currentMode.getPhysicalHeight())
		.findFirst().orElse(null);
		}

		/**
		@@ -273,16 +266,17 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
		mLpChanged.privateFlags &= ~LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
		}

		if (mKeyguardDisplayMode != null) {
		if (mKeyguardRefreshRate > 0) {
		boolean bypassOnKeyguard = mKeyguardBypassController.getBypassEnabled()
		&& state.mStatusBarState == StatusBarState.KEYGUARD
		&& !state.mKeyguardFadingAway && !state.mKeyguardGoingAway;
		if (state.mDozing \|\| bypassOnKeyguard) {
		mLpChanged.preferredDisplayModeId = mKeyguardDisplayMode.getModeId();
		mLpChanged.preferredMaxDisplayRefreshRate = mKeyguardRefreshRate;
		} else {
		mLpChanged.preferredDisplayModeId = 0;
		mLpChanged.preferredMaxDisplayRefreshRate = 0;
		}
		Trace.setCounter("display_mode_id", mLpChanged.preferredDisplayModeId);
		Trace.setCounter("display_max_refresh_rate",
		(long) mLpChanged.preferredMaxDisplayRefreshRate);
		}
		}

		@@ -669,7 +663,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW
		@Override
		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		pw.println(TAG + ":");
		pw.println(" mKeyguardDisplayMode=" + mKeyguardDisplayMode);
		pw.println(" mKeyguardRefreshRate=" + mKeyguardRefreshRate);
		pw.println(mCurrentState);
		if (mNotificationShadeView != null && mNotificationShadeView.getViewRootImpl() != null) {
		mNotificationShadeView.getViewRootImpl().dump(" ", pw);

services/core/java/com/android/server/display/DisplayManagerService.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -1498,8 +1498,8 @@ public final class DisplayManagerService extends SystemService {
		}

		private void setDisplayPropertiesInternal(int displayId, boolean hasContent,
		float requestedRefreshRate, int requestedModeId, boolean preferMinimalPostProcessing,
		boolean inTraversal) {
		float requestedRefreshRate, int requestedModeId, float requestedMaxRefreshRate,
		boolean preferMinimalPostProcessing, boolean inTraversal) {
		synchronized (mSyncRoot) {
		final LogicalDisplay display = mLogicalDisplayMapper.getDisplayLocked(displayId);
		if (display == null) {
		@@ -1523,8 +1523,8 @@ public final class DisplayManagerService extends SystemService {
		requestedModeId = display.getDisplayInfoLocked().findDefaultModeByRefreshRate(
		requestedRefreshRate).getModeId();
		}
		mDisplayModeDirector.getAppRequestObserver().setAppRequestedMode(
		displayId, requestedModeId);
		mDisplayModeDirector.getAppRequestObserver().setAppRequest(
		displayId, requestedModeId, requestedMaxRefreshRate);

		if (display.getDisplayInfoLocked().minimalPostProcessingSupported) {
		boolean mppRequest = mMinimalPostProcessingAllowed && preferMinimalPostProcessing;
		@@ -3189,10 +3189,11 @@ public final class DisplayManagerService extends SystemService {

		@Override
		public void setDisplayProperties(int displayId, boolean hasContent,
		float requestedRefreshRate, int requestedMode,
		float requestedRefreshRate, int requestedMode, float requestedMaxRefreshRate,
		boolean requestedMinimalPostProcessing, boolean inTraversal) {
		setDisplayPropertiesInternal(displayId, hasContent, requestedRefreshRate,
		requestedMode, requestedMinimalPostProcessing, inTraversal);
		requestedMode, requestedMaxRefreshRate, requestedMinimalPostProcessing,
		inTraversal);
		}

		@Override