Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62a3a838 authored by raylinhsu's avatar raylinhsu Committed by android-build-team Robot
Browse files

DO NOT MERGE Revert "Set fixed fps when ambient or display brightness is high" 

This reverts commit 4a0a896a.

Bug: 176018998
Test: atest DisplayModeDirectorTest
Change-Id: Ic9329c59c358742696adbbca9cc2b33f25787eb1
(cherry picked from commit b4bf83a7)
parent 364ecec0

core/res/res/values/config.xml

+0 −29
Original line number Diff line number Diff line
@@ -4138,35 +4138,6 @@ 
         If non-positive, then the refresh rate is unchanged even if thresholds are configured. -->

    <integer name="config_defaultRefreshRateInZone">0</integer>



    <!-- The display uses different gamma curves for different refresh rates. It's hard for panel

         vendor to tune the curves to have exact same brightness for different refresh rate. So

         flicker could be observed at switch time. The issue can be observed on the screen with

         even full white content at the high brightness. To prevent flickering, we support fixed

         refresh rates if the display and ambient brightness are equal to or above the provided

         thresholds. You can define multiple threshold levels as higher brightness environments

         may have lower display brightness requirements for the flickering is visible. And the

         high brightness environment could have higher threshold.

         For example, fixed refresh rate if

             display brightness >= disp0 && ambient brightness >= amb0

             || display brightness >= disp1 && ambient brightness >= amb1 -->

    <integer-array translatable="false" name="config_highDisplayBrightnessThresholdsOfFixedRefreshRate">

         <!--

           <item>disp0</item>

           <item>disp1</item>

        -->

    </integer-array>



    <integer-array translatable="false" name="config_highAmbientBrightnessThresholdsOfFixedRefreshRate">

         <!--

           <item>amb0</item>

           <item>amb1</item>

        -->

    </integer-array>



    <!-- Default refresh rate in the high zone defined by brightness and ambient thresholds.

         If non-positive, then the refresh rate is unchanged even if thresholds are configured. -->

    <integer name="config_fixedRefreshRateInHighZone">0</integer>



    <!-- The type of the light sensor to be used by the display framework for things like

         auto-brightness. If unset, then it just gets the default sensor of type TYPE_LIGHT. -->

    <string name="config_displayLightSensorType" translatable="false" />

core/res/res/values/symbols.xml

+0 −5
Original line number Diff line number Diff line
@@ -3783,11 +3783,6 @@ 
  <java-symbol type="array" name="config_brightnessThresholdsOfPeakRefreshRate" />

  <java-symbol type="array" name="config_ambientThresholdsOfPeakRefreshRate" />



  <!-- For fixed refresh rate displays in high brightness-->

  <java-symbol type="integer" name="config_fixedRefreshRateInHighZone" />

  <java-symbol type="array" name="config_highDisplayBrightnessThresholdsOfFixedRefreshRate" />

  <java-symbol type="array" name="config_highAmbientBrightnessThresholdsOfFixedRefreshRate" />



  <!-- For Auto-Brightness -->

  <java-symbol type="string" name="config_displayLightSensorType" />

services/core/Android.bp

+0 −7
Original line number Diff line number Diff line 
filegroup {

    name: "services.core-sources-deviceconfig-interface",

    srcs: [

         "java/com/android/server/utils/DeviceConfigInterface.java"

    ],

}



filegroup {

    name: "services.core-sources",

    srcs: ["java/**/*.java"],

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

+147 −426

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/wm/HighRefreshRateBlacklist.java

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.util.ArraySet; 
import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.os.BackgroundThread;

import com.android.server.utils.DeviceConfigInterface;

import com.android.server.wm.utils.DeviceConfigInterface;



import java.io.PrintWriter;