summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api/current.txt1
-rw-r--r--api/test-current.txt1
-rw-r--r--core/res/res/values/attrs_manifest.xml5
3 files changed, 3 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt
index 61ae1e091e5c..c44220c5c008 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -198,6 +198,7 @@ package android {
public static final class R.attr {
ctor public R.attr();
+ field public static final int abiOverride = 16844054; // 0x1010516
field public static final int absListViewStyle = 16842858; // 0x101006a
field public static final int accessibilityEventTypes = 16843648; // 0x1010380
field public static final int accessibilityFeedbackType = 16843650; // 0x1010382
diff --git a/api/test-current.txt b/api/test-current.txt
index ad457520b1fd..4e5760627cde 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -198,6 +198,7 @@ package android {
public static final class R.attr {
ctor public R.attr();
+ field public static final int abiOverride = 16844054; // 0x1010516
field public static final int absListViewStyle = 16842858; // 0x101006a
field public static final int accessibilityEventTypes = 16843648; // 0x1010380
field public static final int accessibilityFeedbackType = 16843650; // 0x1010382
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index 15a4ad853535..3a5336cd05f1 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -429,10 +429,7 @@
sets. -->
<attr name="multiArch" format ="boolean" />
- <!-- Specify abiOverride for multiArch application.
- @hide
- @SystemApi
- -->
+ <!-- Specify abiOverride for multiArch application. -->
<attr name="abiOverride" />
<!-- Specify whether a component is allowed to have multiple instances