diff options
| author | 2016-01-13 13:51:07 -0500 | |
|---|---|---|
| committer | 2016-01-13 15:35:50 -0500 | |
| commit | 7b0143cef426b0afbe0d4d01b999cbf82103437d (patch) | |
| tree | 25568ace2f16cb2c8d1d49b96e96402de3a2d2e1 | |
| parent | 4fce66668e45429bbba49b9fb35d3b8d095a466c (diff) | |
Fix SDK docs after b9a8666eb5504f022343fef9087135b7d937ddf8.
Change-Id: Icad19dd1c888b4857d288b460d88bebb9ec20a13
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/res/res/values/attrs_manifest.xml | 6 |
4 files changed, 6 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 1dcd309b16ca..c20523a29c70 100644 --- a/api/current.txt +++ b/api/current.txt @@ -524,6 +524,7 @@ package android { field public static final int expandableListViewStyle = 16842863; // 0x101006f field public static final int expandableListViewWhiteStyle = 16843446; // 0x10102b6 field public static final int exported = 16842768; // 0x1010010 + field public static final int externalService = 16844047; // 0x101050f field public static final int extraTension = 16843371; // 0x101026b field public static final int extractNativeLibs = 16844010; // 0x10104ea field public static final int factor = 16843219; // 0x10101d3 diff --git a/api/system-current.txt b/api/system-current.txt index adce4806c654..174f784bcdb5 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -619,6 +619,7 @@ package android { field public static final int expandableListViewStyle = 16842863; // 0x101006f field public static final int expandableListViewWhiteStyle = 16843446; // 0x10102b6 field public static final int exported = 16842768; // 0x1010010 + field public static final int externalService = 16844047; // 0x101050f field public static final int extraTension = 16843371; // 0x101026b field public static final int extractNativeLibs = 16844010; // 0x10104ea field public static final int factor = 16843219; // 0x10101d3 diff --git a/api/test-current.txt b/api/test-current.txt index 3fed63215746..ad566d191ef9 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -524,6 +524,7 @@ package android { field public static final int expandableListViewStyle = 16842863; // 0x101006f field public static final int expandableListViewWhiteStyle = 16843446; // 0x10102b6 field public static final int exported = 16842768; // 0x1010010 + field public static final int externalService = 16844047; // 0x101050f field public static final int extraTension = 16843371; // 0x101026b field public static final int extractNativeLibs = 16844010; // 0x10104ea field public static final int factor = 16843219; // 0x10101d3 diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index 21e92ba26dbe..6eba78a4ce2b 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -1748,9 +1748,9 @@ <attr name="isolatedProcess" format="boolean" /> <attr name="singleUser" /> <attr name="encryptionAware" /> - <!-- @hide If the service is an {@link #isolatedProcess} service, this permits a client to - bind to the service as if it were running it its own package. The service must also be - {@link #exported} if this flag is set. --> + <!-- If the service is an {@link android.R.attr#isolatedProcess} service, this permits a + client to bind to the service as if it were running it its own package. The service + must also be {@link android.R.attr#exported} if this flag is set. --> <attr name="externalService" format="boolean" /> </declare-styleable> |