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

Commit 94565726 authored by Darryl L Johnson's avatar Darryl L Johnson
Browse files

Add nullability annotations to device state XSD file. 

This adds nullable annotations to tags that can be null at runtime.

Fixes: 175130179
Test: Manual - view generated java API
Change-Id: If9d032a5eff452ddbaa28050b474051fd66db424
parent a11a21fd

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

+21 −7
Original line number Diff line number Diff line
@@ -37,15 +37,21 @@ 
                    </xs:restriction>

                </xs:simpleType>

            </xs:element>

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

            <xs:element name="name" type="xs:string" minOccurs="0">

                <xs:annotation name="nullable" />

            </xs:element>

            <xs:element name="conditions" type="conditions" />

        </xs:sequence>

    </xs:complexType>



    <xs:complexType name="conditions">

        <xs:sequence>

            <xs:element name="lid-switch" type="lidSwitchCondition" minOccurs="0" />

            <xs:element name="sensor" type="sensorCondition" minOccurs="0" maxOccurs="unbounded" />

            <xs:element name="lid-switch" type="lidSwitchCondition" minOccurs="0">

                <xs:annotation name="nullable" />

            </xs:element>

            <xs:element name="sensor" type="sensorCondition" minOccurs="0" maxOccurs="unbounded">

                <xs:annotation name="nullable" />

            </xs:element>

        </xs:sequence>

    </xs:complexType>
@@ -66,12 +72,20 @@ 
    <xs:complexType name="numericRange">

        <xs:sequence>

            <xs:choice minOccurs="0">

                <xs:element name="min" type="xs:decimal" />

                <xs:element name="min-inclusive" type="xs:decimal" />

                <xs:element name="min" type="xs:decimal">

                    <xs:annotation name="nullable" />

                </xs:element>

                <xs:element name="min-inclusive" type="xs:decimal">

                    <xs:annotation name="nullable" />

                </xs:element>

            </xs:choice>

            <xs:choice minOccurs="0">

                <xs:element name="max" type="xs:decimal" />

                <xs:element name="max-inclusive" type="xs:decimal"/>

                <xs:element name="max" type="xs:decimal">

                    <xs:annotation name="nullable" />

                </xs:element>

                <xs:element name="max-inclusive" type="xs:decimal">

                    <xs:annotation name="nullable" />

                </xs:element>

            </xs:choice>

        </xs:sequence>

    </xs:complexType>

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

+13 −13
Original line number Diff line number Diff line
@@ -3,19 +3,19 @@ package com.android.server.policy.devicestate.config { 


  public class Conditions {

    ctor public Conditions();

    method public com.android.server.policy.devicestate.config.LidSwitchCondition getLidSwitch();

    method public java.util.List<com.android.server.policy.devicestate.config.SensorCondition> getSensor();

    method public void setLidSwitch(com.android.server.policy.devicestate.config.LidSwitchCondition);

    method @Nullable public com.android.server.policy.devicestate.config.LidSwitchCondition getLidSwitch();

    method @Nullable public java.util.List<com.android.server.policy.devicestate.config.SensorCondition> getSensor();

    method public void setLidSwitch(@Nullable com.android.server.policy.devicestate.config.LidSwitchCondition);

  }



  public class DeviceState {

    ctor public DeviceState();

    method public com.android.server.policy.devicestate.config.Conditions getConditions();

    method public java.math.BigInteger getIdentifier();

    method public String getName();

    method @Nullable public String getName();

    method public void setConditions(com.android.server.policy.devicestate.config.Conditions);

    method public void setIdentifier(java.math.BigInteger);

    method public void setName(String);

    method public void setName(@Nullable String);

  }



  public class DeviceStateConfig {
@@ -31,14 +31,14 @@ package com.android.server.policy.devicestate.config { 


  public class NumericRange {

    ctor public NumericRange();

    method public java.math.BigDecimal getMaxInclusive_optional();

    method public java.math.BigDecimal getMax_optional();

    method public java.math.BigDecimal getMinInclusive_optional();

    method public java.math.BigDecimal getMin_optional();

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

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

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

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

    method @Nullable public java.math.BigDecimal getMaxInclusive_optional();

    method @Nullable public java.math.BigDecimal getMax_optional();

    method @Nullable public java.math.BigDecimal getMinInclusive_optional();

    method @Nullable public java.math.BigDecimal getMin_optional();

    method public void setMaxInclusive_optional(@Nullable java.math.BigDecimal);

    method public void setMax_optional(@Nullable java.math.BigDecimal);

    method public void setMinInclusive_optional(@Nullable java.math.BigDecimal);

    method public void setMin_optional(@Nullable java.math.BigDecimal);

  }



  public class SensorCondition {