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

Commit 354c54b1 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Fix the resource IDs used by CTS tests 

* Google didn't make networkAttributes a public resource, so everyone
  is failing CTS after adding new resources to the framework. This
  fixes it.
* Same thing with config_useFixedVolume

Change-Id: I720b36d0922b636fe30f691f016add6b8cc7ade3
parent ba9e20a2

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ package android { 
    ctor public R.array();

    field public static final int emailAddressTypes = 17235968; // 0x1070000

    field public static final int imProtocols = 17235969; // 0x1070001

    field public static final int networkAttributes = 17235979; // 0x107000b

    field public static final int organizationTypes = 17235970; // 0x1070002

    field public static final int phoneTypes = 17235971; // 0x1070003

    field public static final int postalAddressTypes = 17235972; // 0x1070004
@@ -1236,6 +1237,7 @@ package android { 














  public static final class R.bool {















    ctor public R.bool();













    field public static final int config_useFixedVolume = 17891414; // 0x1110056















  }





























  public static final class R.color {

























core/res/res/values/public.xml



+6
−0




























Original line number
Diff line number
Diff line








@@ -2087,4 +2087,10 @@













  <public type="style" name="Theme.DeviceDefault.NoActionBar.TranslucentDecor" id="0x010301e3" />















  <public type="style" name="Theme.DeviceDefault.Light.NoActionBar.TranslucentDecor" id="0x010301e4" />





























  <!-- CTS tests reference these resources, but fail because we added













       new ones, changing the order, and Google didn't declare these













       as public resources. This fixes it for the 4.4_r1 CTS release. -->













  <public type="bool" name="config_useFixedVolume" id="0x1110056" />













  <public type="array" name="networkAttributes" id="0x107000b" />





























</resources>