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

Commit e2d1f533 authored by Antony Sargent's avatar Antony Sargent Committed by Android (Google) Code Review
Browse files

Merge "Use isFoo instead of getFoo style for display-layout-config.xsd... 

Merge "Use isFoo instead of getFoo style for display-layout-config.xsd generated methods" into sc-v2-dev
parents 8f980c75 a8a3337e

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

+2 −2
Original line number Diff line number Diff line
@@ -111,8 +111,8 @@ class DeviceStateToLayoutMap { 
                for (com.android.server.display.config.layout.Display d: l.getDisplay()) {

                    layout.createDisplayLocked(

                            DisplayAddress.fromPhysicalDisplayId(d.getAddress().longValue()),

                            d.getIsDefault(),

                            d.getEnabled());

                            d.isDefaultDisplay(),

                            d.isEnabled());

                }

            }

        } catch (IOException | DatatypeConfigurationException | XmlPullParserException e) {

services/core/xsd/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ xsd_config { 
    package_name: "com.android.server.pm.permission.configfile",

}





xsd_config {

    name: "platform-compat-config",

    srcs: ["platform-compat/config/platform-compat-config.xsd"],
@@ -42,6 +41,7 @@ xsd_config { 
    srcs: ["display-layout-config/display-layout-config.xsd"],

    api_dir: "display-layout-config/schema",

    package_name: "com.android.server.display.config.layout",

    boolean_getter: true,

}



xsd_config {

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

+1 −1
Original line number Diff line number Diff line
@@ -52,6 +52,6 @@ 
            <xs:element name="address" type="xs:nonNegativeInteger"/>

        </xs:sequence>

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

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

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

    </xs:complexType>

</xs:schema>

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

+3 −3
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ package com.android.server.display.config.layout { 
  public class Display {

    ctor public Display();

    method public java.math.BigInteger getAddress();

    method public boolean getEnabled();

    method public boolean getIsDefault();

    method public boolean isDefaultDisplay();

    method public boolean isEnabled();

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

    method public void setDefaultDisplay(boolean);

    method public void setEnabled(boolean);

    method public void setIsDefault(boolean);

  }



  public class Layout {