Merge "Make COLUMN_CAPACITY_BYTES public." into nyc-dev

This commit is contained in:
Steve McKay
2016-03-04 02:12:01 +00:00
committed by Android (Google) Code Review
4 changed files with 3 additions and 1 deletions

View File

@@ -31715,6 +31715,7 @@ package android.provider {
public static final class DocumentsContract.Root {
field public static final java.lang.String COLUMN_AVAILABLE_BYTES = "available_bytes";
field public static final java.lang.String COLUMN_CAPACITY_BYTES = "capacity_bytes";
field public static final java.lang.String COLUMN_DOCUMENT_ID = "document_id";
field public static final java.lang.String COLUMN_FLAGS = "flags";
field public static final java.lang.String COLUMN_ICON = "icon";

View File

@@ -34100,6 +34100,7 @@ package android.provider {
public static final class DocumentsContract.Root {
field public static final java.lang.String COLUMN_AVAILABLE_BYTES = "available_bytes";
field public static final java.lang.String COLUMN_CAPACITY_BYTES = "capacity_bytes";
field public static final java.lang.String COLUMN_DOCUMENT_ID = "document_id";
field public static final java.lang.String COLUMN_FLAGS = "flags";
field public static final java.lang.String COLUMN_ICON = "icon";

View File

@@ -31730,6 +31730,7 @@ package android.provider {
public static final class DocumentsContract.Root {
field public static final java.lang.String COLUMN_AVAILABLE_BYTES = "available_bytes";
field public static final java.lang.String COLUMN_CAPACITY_BYTES = "capacity_bytes";
field public static final java.lang.String COLUMN_DOCUMENT_ID = "document_id";
field public static final java.lang.String COLUMN_FLAGS = "flags";
field public static final java.lang.String COLUMN_ICON = "icon";

View File

@@ -478,7 +478,6 @@ public final class DocumentsContract {
/**
* Capacity of a root in bytes. This column is optional, and may be
* {@code null} if unknown or unbounded.
* {@hide}
* <p>
* Type: INTEGER (long)
*/