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

Commit 01cdb0a5 authored by Long Ling's avatar Long Ling Committed by Android (Google) Code Review
Browse files

Merge "Remove enum type Interpolation from displayconfig"

parents 1d8030a1 51b62b9c

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

+8 −11
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import com.android.server.display.config.DisplayConfiguration; 
import com.android.server.display.config.DisplayQuirks;

import com.android.server.display.config.HbmTiming;

import com.android.server.display.config.HighBrightnessMode;

import com.android.server.display.config.Interpolation;

import com.android.server.display.config.NitsMap;

import com.android.server.display.config.Point;

import com.android.server.display.config.RefreshRateRange;
@@ -1254,20 +1253,18 @@ public class DisplayDeviceConfig { 
        }

    }



    private int convertInterpolationType(Interpolation value) {

        if (value == null) {

    private int convertInterpolationType(String value) {

        if (TextUtils.isEmpty(value)) {

            return INTERPOLATION_DEFAULT;

        }

        switch (value) {

            case _default:

                return INTERPOLATION_DEFAULT;

            case linear:



        if ("linear".equals(value)) {

            return INTERPOLATION_LINEAR;

            default:

        }



        Slog.wtf(TAG, "Unexpected Interpolation Type: " + value);

        return INTERPOLATION_DEFAULT;

    }

    }



    private void loadAmbientHorizonFromDdc(DisplayConfiguration config) {

        final BigInteger configLongHorizon = config.getAmbientLightHorizonLong();

services/core/xsd/display-device-config/display-device-config.xsd

+2 −9
Original line number Diff line number Diff line
@@ -170,14 +170,6 @@ 
        </xs:restriction>

    </xs:simpleType>



    <!-- Maps to DisplayDeviceConfig.INTERPOLATION_* values. -->

    <xs:simpleType name="interpolation">

        <xs:restriction base="xs:string">

            <xs:enumeration value="default"/>

            <xs:enumeration value="linear"/>

        </xs:restriction>

    </xs:simpleType>



    <xs:complexType name="thermalThrottling">

        <xs:complexType>

            <xs:element type="brightnessThrottlingMap" name="brightnessThrottlingMap">
@@ -216,7 +208,8 @@ 
                <xs:annotation name="final"/>

            </xs:element>

        </xs:sequence>

        <xs:attribute name="interpolation" type="interpolation" use="optional"/>

        <!-- valid value of interpolation if specified: linear -->

        <xs:attribute name="interpolation" type="xs:string" use="optional"/>

    </xs:complexType>



    <xs:complexType name="point">

services/core/xsd/display-device-config/schema/current.txt

+2 −8
Original line number Diff line number Diff line
@@ -108,17 +108,11 @@ package com.android.server.display.config { 
    method public final void setTransitionPoint_all(@NonNull java.math.BigDecimal);

  }



  public enum Interpolation {

    method public String getRawName();

    enum_constant public static final com.android.server.display.config.Interpolation _default;

    enum_constant public static final com.android.server.display.config.Interpolation linear;

  }



  public class NitsMap {

    ctor public NitsMap();

    method public com.android.server.display.config.Interpolation getInterpolation();

    method public String getInterpolation();

    method @NonNull public final java.util.List<com.android.server.display.config.Point> getPoint();

    method public void setInterpolation(com.android.server.display.config.Interpolation);

    method public void setInterpolation(String);

  }



  public class Point {