Merge changes from topic "ddc_changes" into rvc-dev am: b529a3f16b (da256df2) · Commits · e / os / android_frameworks_base

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

+0 −17

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,6 @@ import java.io.File;
	import java.io.FileInputStream;		import java.io.FileInputStream;
	import java.io.IOException;		import java.io.IOException;
	import java.io.InputStream;		import java.io.InputStream;
	import java.math.BigDecimal;
	import java.util.List;		import java.util.List;

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

	private float[] mNits;		private float[] mNits;
	private float[] mBrightness;		private float[] mBrightness;
	private BigDecimal mHighBrightnessModeStart;

	private DisplayDeviceConfig() {		private DisplayDeviceConfig() {
	}		}
	@@ -88,18 +86,6 @@ public class DisplayDeviceConfig {
	return mBrightness;		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) {		private void initFromFile(File configFile) {
	if (!configFile.exists()) {		if (!configFile.exists()) {
	// Display configuration files aren't required to exist.		// Display configuration files aren't required to exist.
	@@ -148,9 +134,6 @@ public class DisplayDeviceConfig {
	}		}
	++i;		++i;
	}		}
	final BigDecimal hbmStart = map.getHighBrightnessStart();

	mHighBrightnessModeStart = hbmStart;
	mNits = nits;		mNits = nits;
	mBrightness = backlight;		mBrightness = backlight;
	}		}

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

+16 −5

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,10 @@
	<xs:element name="displayConfiguration">		<xs:element name="displayConfiguration">
	<xs:complexType>		<xs:complexType>
	<xs:sequence>		<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:sequence>
	</xs:complexType>		</xs:complexType>
	</xs:element>		</xs:element>
	@@ -34,15 +37,23 @@

	<xs:complexType name="nitsMap">		<xs:complexType name="nitsMap">
	<xs:sequence>		<xs:sequence>
	<xs:element name="point" type="point" maxOccurs="unbounded" minOccurs="2"/>		<xs:element name="point" type="point" maxOccurs="unbounded" minOccurs="2">
	<xs:element name="highBrightnessStart" minOccurs="0" type="nonNegativeDecimal"/>		<xs:annotation name="nonnull"/>
			<xs:annotation name="final"/>
			</xs:element>
	</xs:sequence>		</xs:sequence>
	</xs:complexType>		</xs:complexType>

	<xs:complexType name="point">		<xs:complexType name="point">
	<xs:sequence>		<xs:sequence>
	<xs:element type="nonNegativeDecimal" name="value"/>		<xs:element type="nonNegativeDecimal" name="value">
	<xs:element type="nonNegativeDecimal" name="nits"/>		<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:sequence>
	</xs:complexType>		</xs:complexType>

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

+7 −9

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

	public class DisplayConfiguration {		public class DisplayConfiguration {
	ctor public DisplayConfiguration();		ctor public DisplayConfiguration();
	method public com.android.server.display.config.NitsMap getScreenBrightnessMap();		method @NonNull public final com.android.server.display.config.NitsMap getScreenBrightnessMap();
	method public void setScreenBrightnessMap(com.android.server.display.config.NitsMap);		method public final void setScreenBrightnessMap(@NonNull com.android.server.display.config.NitsMap);
	}		}

	public class NitsMap {		public class NitsMap {
	ctor public NitsMap();		ctor public NitsMap();
	method public java.math.BigDecimal getHighBrightnessStart();		method @NonNull public final java.util.List<com.android.server.display.config.Point> getPoint();
	method public java.util.List<com.android.server.display.config.Point> getPoint();
	method public void setHighBrightnessStart(java.math.BigDecimal);
	}		}

	public class Point {		public class Point {
	ctor public Point();		ctor public Point();
	method public java.math.BigDecimal getNits();		method @NonNull public final java.math.BigDecimal getNits();
	method public java.math.BigDecimal getValue();		method @NonNull public final java.math.BigDecimal getValue();
	method public void setNits(java.math.BigDecimal);		method public final void setNits(@NonNull java.math.BigDecimal);
	method public void setValue(java.math.BigDecimal);		method public final void setValue(@NonNull java.math.BigDecimal);
	}		}

	public class XmlParser {		public class XmlParser {