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

Commit 76774af1 authored Jan 07, 2016 by Tomasz Mikolajewski Committed by Android (Google) Code Review Jan 07, 2016

Merge "Revert "Revert "Update APIs for the flag changes in SAF."""

parents 4b6ac4a3 4cc43f01

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -30779,7 +30779,7 @@ package android.provider {
		field public static final java.lang.String COLUMN_MIME_TYPE = "mime_type";
		field public static final java.lang.String COLUMN_SIZE = "_size";
		field public static final java.lang.String COLUMN_SUMMARY = "summary";
		field public static final int FLAG_ARCHIVE = 2048; // 0x800
		field public static final int FLAG_ARCHIVE = 1024; // 0x400
		field public static final int FLAG_DIR_PREFERS_GRID = 16; // 0x10
		field public static final int FLAG_DIR_PREFERS_LAST_MODIFIED = 32; // 0x20
		field public static final int FLAG_DIR_SUPPORTS_CREATE = 8; // 0x8
		@@ -30789,7 +30789,7 @@ package android.provider {
		field public static final int FLAG_SUPPORTS_RENAME = 64; // 0x40
		field public static final int FLAG_SUPPORTS_THUMBNAIL = 1; // 0x1
		field public static final int FLAG_SUPPORTS_WRITE = 2; // 0x2
		field public static final int FLAG_VIRTUAL_DOCUMENT = 1024; // 0x400
		field public static final int FLAG_VIRTUAL_DOCUMENT = 512; // 0x200
		field public static final java.lang.String MIME_TYPE_DIR = "vnd.android.document/directory";
		}

api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -32812,7 +32812,7 @@ package android.provider {
		field public static final java.lang.String COLUMN_MIME_TYPE = "mime_type";
		field public static final java.lang.String COLUMN_SIZE = "_size";
		field public static final java.lang.String COLUMN_SUMMARY = "summary";
		field public static final int FLAG_ARCHIVE = 2048; // 0x800
		field public static final int FLAG_ARCHIVE = 1024; // 0x400
		field public static final int FLAG_DIR_PREFERS_GRID = 16; // 0x10
		field public static final int FLAG_DIR_PREFERS_LAST_MODIFIED = 32; // 0x20
		field public static final int FLAG_DIR_SUPPORTS_CREATE = 8; // 0x8
		@@ -32822,7 +32822,7 @@ package android.provider {
		field public static final int FLAG_SUPPORTS_RENAME = 64; // 0x40
		field public static final int FLAG_SUPPORTS_THUMBNAIL = 1; // 0x1
		field public static final int FLAG_SUPPORTS_WRITE = 2; // 0x2
		field public static final int FLAG_VIRTUAL_DOCUMENT = 1024; // 0x400
		field public static final int FLAG_VIRTUAL_DOCUMENT = 512; // 0x200
		field public static final java.lang.String MIME_TYPE_DIR = "vnd.android.document/directory";
		}

api/test-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -30791,7 +30791,7 @@ package android.provider {
		field public static final java.lang.String COLUMN_MIME_TYPE = "mime_type";
		field public static final java.lang.String COLUMN_SIZE = "_size";
		field public static final java.lang.String COLUMN_SUMMARY = "summary";
		field public static final int FLAG_ARCHIVE = 2048; // 0x800
		field public static final int FLAG_ARCHIVE = 1024; // 0x400
		field public static final int FLAG_DIR_PREFERS_GRID = 16; // 0x10
		field public static final int FLAG_DIR_PREFERS_LAST_MODIFIED = 32; // 0x20
		field public static final int FLAG_DIR_SUPPORTS_CREATE = 8; // 0x8
		@@ -30801,7 +30801,7 @@ package android.provider {
		field public static final int FLAG_SUPPORTS_RENAME = 64; // 0x40
		field public static final int FLAG_SUPPORTS_THUMBNAIL = 1; // 0x1
		field public static final int FLAG_SUPPORTS_WRITE = 2; // 0x2
		field public static final int FLAG_VIRTUAL_DOCUMENT = 1024; // 0x400
		field public static final int FLAG_VIRTUAL_DOCUMENT = 512; // 0x200
		field public static final java.lang.String MIME_TYPE_DIR = "vnd.android.document/directory";
		}