Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Antony Sargent
2021-08-12 16:17:45 +00:00
committed by Android (Google) Code Review
parent 8f980c7567 a8a3337e85
commit e2d1f53333
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/display/DeviceStateToLayoutMap.java
View File

@@ -111,8 +111,8 @@ class DeviceStateToLayoutMap {
for (com.android.server.display.config.layout.Display d: l.getDisplay()) { for (com.android.server.display.config.layout.Display d: l.getDisplay()) {
layout.createDisplayLocked( layout.createDisplayLocked(
DisplayAddress.fromPhysicalDisplayId(d.getAddress().longValue()), DisplayAddress.fromPhysicalDisplayId(d.getAddress().longValue()),
d.getIsDefault(), d.isDefaultDisplay(),
d.getEnabled()); d.isEnabled());
} }
} }
} catch (IOException | DatatypeConfigurationException | XmlPullParserException e) { } catch (IOException | DatatypeConfigurationException | XmlPullParserException e) {

2
services/core/xsd/Android.bp
View File

@@ -14,7 +14,6 @@ xsd_config {
package_name: "com.android.server.pm.permission.configfile", package_name: "com.android.server.pm.permission.configfile",
} }
xsd_config { xsd_config {
name: "platform-compat-config", name: "platform-compat-config",
srcs: ["platform-compat/config/platform-compat-config.xsd"], srcs: ["platform-compat/config/platform-compat-config.xsd"],
@@ -42,6 +41,7 @@ xsd_config {
srcs: ["display-layout-config/display-layout-config.xsd"], srcs: ["display-layout-config/display-layout-config.xsd"],
api_dir: "display-layout-config/schema", api_dir: "display-layout-config/schema",
package_name: "com.android.server.display.config.layout", package_name: "com.android.server.display.config.layout",
boolean_getter: true,
} }
xsd_config { xsd_config {

2
services/core/xsd/display-layout-config/display-layout-config.xsd
View File

@@ -52,6 +52,6 @@
<xs:element name="address" type="xs:nonNegativeInteger"/> <xs:element name="address" type="xs:nonNegativeInteger"/>
</xs:sequence> </xs:sequence>
<xs:attribute name="enabled" type="xs:boolean" use="optional" /> <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:complexType>
</xs:schema> </xs:schema>

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

@@ -4,11 +4,11 @@ package com.android.server.display.config.layout {
public class Display { public class Display {
ctor public Display(); ctor public Display();
method public java.math.BigInteger getAddress(); method public java.math.BigInteger getAddress();
method public boolean getEnabled(); method public boolean isDefaultDisplay();
method public boolean getIsDefault(); method public boolean isEnabled();
method public void setAddress(java.math.BigInteger); method public void setAddress(java.math.BigInteger);
method public void setDefaultDisplay(boolean);
method public void setEnabled(boolean); method public void setEnabled(boolean);
method public void setIsDefault(boolean);
} }
public class Layout { public class Layout {