commit bc841b029311400ef2602bafe9b3776310d5e8a7
author Long Ling <longling@google.com> Wed Jul 03 16:43:15 2019 -0700
committer Long Ling <longling@google.com> Mon Jul 15 21:32:39 2019 +0000
tree d7542b4856abdea86484ddfeeb45e4f365f892c7
parent 62a81ab99a121ed2017b102b3802598b19ab712a

60hz only when ambient or display brightness is low

Due to hardware limitation, flickers are seen when switching between 60
and 90hz at low display and ambient brightness. Force the display to stay
at 60hz when ambient and display brightness are low.

Bug: 136461712
Exempt-From-Owner-Approval: Santos is designated by Michael
Change-Id: I931288c46fc658e25b25249a160904b3e2dcfb94

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

diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java
index 99341d1..4f33ebb0 100644
--- a/services/core/java/com/android/server/display/DisplayManagerService.java
+++ b/services/core/java/com/android/server/display/DisplayManagerService.java
@@ -303,6 +303,8 @@
     private final Spline mMinimumBrightnessSpline;
     private final ColorSpace mWideColorSpace;
 
+    private SensorManager mSensorManager;
+
     public DisplayManagerService(Context context) {
         this(context, new Injector());
     }
@@ -430,7 +432,7 @@
         }
 
         mDisplayModeDirector.setListener(new AllowedDisplayModeObserver());
-        mDisplayModeDirector.start();
+        mDisplayModeDirector.start(mSensorManager);
 
         mHandler.sendEmptyMessage(MSG_REGISTER_ADDITIONAL_DISPLAY_ADAPTERS);
     }
@@ -2358,6 +2360,7 @@
                 };
                 mDisplayPowerController = new DisplayPowerController(
                         mContext, callbacks, handler, sensorManager, blanker);
+                mSensorManager = sensorManager;
             }
 
             mHandler.sendEmptyMessage(MSG_LOAD_BRIGHTNESS_CONFIGURATION);