Merge "Fix SDK docs after b9a8666eb5504f022343fef9087135b7d937ddf8."

This commit is contained in:
Robert Sesek
2016-01-13 21:24:00 +00:00
committed by Android (Google) Code Review
4 changed files with 6 additions and 3 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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>