diff options
| -rw-r--r-- | services/core/xsd/display-device-config/display-device-config.xsd | 24 | ||||
| -rw-r--r-- | services/core/xsd/display-device-config/schema/current.txt | 18 |
2 files changed, 28 insertions, 14 deletions
diff --git a/services/core/xsd/display-device-config/display-device-config.xsd b/services/core/xsd/display-device-config/display-device-config.xsd index 5c7f30576741..fd3083692285 100644 --- a/services/core/xsd/display-device-config/display-device-config.xsd +++ b/services/core/xsd/display-device-config/display-device-config.xsd @@ -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,26 @@ <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:element name="highBrightnessStart" minOccurs="0" type="nonNegativeDecimal"> + <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> diff --git a/services/core/xsd/display-device-config/schema/current.txt b/services/core/xsd/display-device-config/schema/current.txt index 5a9c9457b423..7e3a2dce4adb 100644 --- a/services/core/xsd/display-device-config/schema/current.txt +++ b/services/core/xsd/display-device-config/schema/current.txt @@ -3,23 +3,23 @@ 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 public final java.math.BigDecimal getHighBrightnessStart(); + method @NonNull public final java.util.List<com.android.server.display.config.Point> getPoint(); + method public final void setHighBrightnessStart(java.math.BigDecimal); } 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 { |