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

Commit b529a3f1 authored by Santos Cordon's avatar Santos Cordon Committed by Android (Google) Code Review
Browse files

Merge changes from topic "ddc_changes" into rvc-dev 

* changes:
  Remove HBM addition to display config.
  Adding final/nonnull annotations to display device config XSD.
parents 22431018 d0e4e3d0

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

+0 −17
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import java.io.File; 
import java.io.FileInputStream;

import java.io.IOException;

import java.io.InputStream;

import java.math.BigDecimal;

import java.util.List;



import javax.xml.datatype.DatatypeConfigurationException;
@@ -50,7 +49,6 @@ public class DisplayDeviceConfig { 


    private float[] mNits;

    private float[] mBrightness;

    private BigDecimal mHighBrightnessModeStart;



    private DisplayDeviceConfig() {

    }
@@ -88,18 +86,6 @@ public class DisplayDeviceConfig { 
        return mBrightness;

    }



    /**

     * Returns the point along the brightness value range {@link #getBrightness()} that

     * high-brightness-mode begins. If high-brightness-mode is not supported, then

     * Float.NaN is returned.

     *

     * @return The high brightness mode threshold, or Float.NaN if not supported.

     */

    public float getHighBrightnessModeStart() {

        return mHighBrightnessModeStart != null

                ? mHighBrightnessModeStart.floatValue() : HIGH_BRIGHTNESS_MODE_UNSUPPORTED;

    }



    private void initFromFile(File configFile) {

        if (!configFile.exists()) {

            // Display configuration files aren't required to exist.
@@ -148,9 +134,6 @@ public class DisplayDeviceConfig { 
            }

            ++i;

        }

        final BigDecimal hbmStart = map.getHighBrightnessStart();



        mHighBrightnessModeStart = hbmStart;

        mNits = nits;

        mBrightness = backlight;

    }

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

+16 −5
Original line number Diff line number Diff line
@@ -25,7 +25,10 @@ 
    <xs:element name="displayConfiguration">

        <xs:complexType>

            <xs:sequence>

                <xs:element type="nitsMap" name="screenBrightnessMap"/>

                <xs:element type="nitsMap" name="screenBrightnessMap">

                    <xs:annotation name="nonnull"/>

                    <xs:annotation name="final"/>

                </xs:element>

            </xs:sequence>

        </xs:complexType>

    </xs:element>
@@ -34,15 +37,23 @@ 


    <xs:complexType name="nitsMap">

        <xs:sequence>

            <xs:element name="point" type="point" maxOccurs="unbounded" minOccurs="2"/>

            <xs:element name="highBrightnessStart" minOccurs="0" type="nonNegativeDecimal"/>

            <xs:element name="point" type="point" maxOccurs="unbounded" minOccurs="2">

                <xs:annotation name="nonnull"/>

                <xs:annotation name="final"/>

            </xs:element>

        </xs:sequence>

    </xs:complexType>



    <xs:complexType name="point">

        <xs:sequence>

            <xs:element type="nonNegativeDecimal" name="value"/>

            <xs:element type="nonNegativeDecimal" name="nits"/>

            <xs:element type="nonNegativeDecimal" name="value">

                <xs:annotation name="nonnull"/>

                <xs:annotation name="final"/>

            </xs:element>

            <xs:element type="nonNegativeDecimal" name="nits">

                <xs:annotation name="nonnull"/>

                <xs:annotation name="final"/>

            </xs:element>

        </xs:sequence>

    </xs:complexType>

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

+7 −9
Original line number Diff line number Diff line
@@ -3,23 +3,21 @@ package com.android.server.display.config { 


  public class DisplayConfiguration {

    ctor public DisplayConfiguration();

    method public com.android.server.display.config.NitsMap getScreenBrightnessMap();

    method public void setScreenBrightnessMap(com.android.server.display.config.NitsMap);

    method @NonNull public final com.android.server.display.config.NitsMap getScreenBrightnessMap();

    method public final void setScreenBrightnessMap(@NonNull com.android.server.display.config.NitsMap);

  }



  public class NitsMap {

    ctor public NitsMap();

    method public java.math.BigDecimal getHighBrightnessStart();

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

    method public void setHighBrightnessStart(java.math.BigDecimal);

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

  }



  public class Point {

    ctor public Point();

    method public java.math.BigDecimal getNits();

    method public java.math.BigDecimal getValue();

    method public void setNits(java.math.BigDecimal);

    method public void setValue(java.math.BigDecimal);

    method @NonNull public final java.math.BigDecimal getNits();

    method @NonNull public final java.math.BigDecimal getValue();

    method public final void setNits(@NonNull java.math.BigDecimal);

    method public final void setValue(@NonNull java.math.BigDecimal);

  }



  public class XmlParser {