Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Remove the flag and make openTypedDocument throw FileNotFoundException.""

Browse Source
This commit is contained in:
Tomasz Mikolajewski
2016-01-07 04:47:42 +00:00
committed by Android (Google) Code Review
parent 475c19532d 2b93171978
commit 97dd67cc34
9 changed files with 44 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -30788,6 +30788,7 @@ package android.provider {
field public static final int FLAG_SUPPORTS_MOVE = 256; // 0x100
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_TYPED_DOCUMENT = 512; // 0x200
field public static final int FLAG_SUPPORTS_WRITE = 2; // 0x2
field public static final int FLAG_VIRTUAL_DOCUMENT = 1024; // 0x400
field public static final java.lang.String MIME_TYPE_DIR = "vnd.android.document/directory";

1
api/system-current.txt
View File

@@ -32821,6 +32821,7 @@ package android.provider {
field public static final int FLAG_SUPPORTS_MOVE = 256; // 0x100
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_TYPED_DOCUMENT = 512; // 0x200
field public static final int FLAG_SUPPORTS_WRITE = 2; // 0x2
field public static final int FLAG_VIRTUAL_DOCUMENT = 1024; // 0x400
field public static final java.lang.String MIME_TYPE_DIR = "vnd.android.document/directory";

1
api/test-current.txt
View File

@@ -30800,6 +30800,7 @@ package android.provider {
field public static final int FLAG_SUPPORTS_MOVE = 256; // 0x100
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_TYPED_DOCUMENT = 512; // 0x200
field public static final int FLAG_SUPPORTS_WRITE = 2; // 0x2
field public static final int FLAG_VIRTUAL_DOCUMENT = 1024; // 0x400
field public static final java.lang.String MIME_TYPE_DIR = "vnd.android.document/directory";

14
core/java/android/provider/DocumentsContract.java
View File

@@ -230,6 +230,7 @@ public final class DocumentsContract {
* @see #FLAG_SUPPORTS_WRITE
* @see #FLAG_SUPPORTS_DELETE
* @see #FLAG_SUPPORTS_THUMBNAIL
* @see #FLAG_SUPPORTS_TYPED_DOCUMENT
* @see #FLAG_DIR_PREFERS_GRID
* @see #FLAG_DIR_PREFERS_LAST_MODIFIED
* @see #FLAG_VIRTUAL_DOCUMENT
@@ -347,6 +348,15 @@ public final class DocumentsContract {
*/
public static final int FLAG_SUPPORTS_MOVE = 1 << 8;
/**
* Flag indicating that a document can be converted to alternative types.
*
* @see #COLUMN_FLAGS
* @see DocumentsProvider#openTypedDocument(String, String, Bundle,
* android.os.CancellationSignal)
*/
public static final int FLAG_SUPPORTS_TYPED_DOCUMENT = 1 << 9;
/**
* Flag indicating that a document is virtual, and doesn't have byte
* representation in the MIME type specified as {@link #COLUMN_MIME_TYPE}.
@@ -356,7 +366,7 @@ public final class DocumentsContract {
* @see DocumentsProvider#openTypedDocument(String, String, Bundle,
* android.os.CancellationSignal)
*/
public static final int FLAG_VIRTUAL_DOCUMENT = 1 << 9;
public static final int FLAG_VIRTUAL_DOCUMENT = 1 << 10;
/**
* Flag indicating that a document is an archive, and it's contents can be
@@ -368,7 +378,7 @@ public final class DocumentsContract {
* @see #COLUMN_FLAGS
* @see DocumentsProvider#queryChildDocuments(String, String[], String)
*/
public static final int FLAG_ARCHIVE = 1 << 10;
public static final int FLAG_ARCHIVE = 1 << 11;
/**
* Flag indicating that document titles should be hidden when viewing

3
core/java/android/provider/DocumentsProvider.java
View File

@@ -517,12 +517,13 @@ public abstract class DocumentsProvider extends ContentProvider {
* provider.
* @param signal used by the caller to signal if the request should be
* cancelled. May be null.
* @see Document#FLAG_SUPPORTS_TYPED_DOCUMENT
*/
@SuppressWarnings("unused")
public AssetFileDescriptor openTypedDocument(
String documentId, String mimeTypeFilter, Bundle opts, CancellationSignal signal)
throws FileNotFoundException {
throw new FileNotFoundException("The requested MIME type is not supported.");
throw new UnsupportedOperationException("Typed documents not supported");
}
/**

13
packages/DocumentsUI/src/com/android/documentsui/CopyService.java
View File

@@ -502,6 +502,11 @@ public class CopyService extends IntentService {
// If the file is virtual, but can be converted to another format, then try to copy it
// as such format. Also, append an extension for the target mime type (if known).
if (srcInfo.isVirtualDocument()) {
if (!srcInfo.isTypedDocument()) {
// Impossible to copy a file which is virtual, but not typed.
mFailedFiles.add(srcInfo);
return false;
}
final String[] streamTypes = getContentResolver().getStreamTypes(
srcInfo.derivedUri, "*/*");
if (streamTypes != null && streamTypes.length > 0) {
@@ -511,7 +516,8 @@ public class CopyService extends IntentService {
dstDisplayName = srcInfo.displayName +
(extension != null ? "." + extension : srcInfo.displayName);
} else {
// The virtual file is not available as any alternative streamable format.
// The provider says that it supports typed documents, but doesn't say
// anything about available formats.
// TODO: Log failures. b/26192412
mFailedFiles.add(srcInfo);
return false;
@@ -634,8 +640,9 @@ public class CopyService extends IntentService {
boolean success = true;
try {
// If the file is virtual, then try to copy it as an alternative format.
if (srcInfo.isVirtualDocument()) {
// If the file is virtual, but can be converted to another format, then try to copy it
// as such format.
if (srcInfo.isVirtualDocument() && srcInfo.isTypedDocument()) {
final AssetFileDescriptor srcFileAsAsset =
mSrcClient.openTypedAssetFileDescriptor(
srcInfo.derivedUri, mimeType, null, canceller);

4
packages/DocumentsUI/src/com/android/documentsui/model/DocumentInfo.java
View File

@@ -255,6 +255,10 @@ public class DocumentInfo implements Durable, Parcelable {
return (flags & Document.FLAG_VIRTUAL_DOCUMENT) != 0;
}
public boolean isTypedDocument() {
return (flags & Document.FLAG_SUPPORTS_TYPED_DOCUMENT) != 0;
}
public int hashCode() {
return derivedUri.hashCode() + mimeType.hashCode();
}

4
packages/DocumentsUI/tests/src/com/android/documentsui/CopyServiceTest.java
View File

@@ -311,8 +311,10 @@ public class CopyServiceTest extends ServiceTestCase<CopyService> {
public void testCopyVirtualNonTypedFile() throws Exception {
String srcPath = "/non-typed.sth";
// Empty stream types causes the FLAG_SUPPORTS_TYPED_DOCUMENT to be not set.
ArrayList<String> streamTypes = new ArrayList<>();
Uri testFile = mStorage.createVirtualFile(SRC_ROOT, srcPath, "virtual/mime-type",
null /* streamTypes */, "I love Tokyo!".getBytes());
streamTypes, "I love Tokyo!".getBytes());
Intent intent = createCopyIntent(Lists.newArrayList(testFile));
startService(intent);

14
packages/DocumentsUI/tests/src/com/android/documentsui/StubProvider.java
View File

@@ -316,9 +316,12 @@ public class StubProvider extends DocumentsProvider {
String documentId, String mimeTypeFilter, Bundle opts, CancellationSignal signal)
throws FileNotFoundException {
final StubDocument document = mStorage.get(documentId);
if (document == null || !document.file.isFile() || document.streamTypes == null) {
if (document == null || !document.file.isFile()) {
throw new FileNotFoundException();
}
if ((document.flags & Document.FLAG_SUPPORTS_TYPED_DOCUMENT) == 0) {
throw new IllegalStateException("Tried to open a non-typed document as typed.");
}
for (final String mimeType : document.streamTypes) {
// Strict compare won't accept wildcards, but that's OK for tests, as DocumentsUI
// doesn't use them for getStreamTypes nor openTypedDocument.
@@ -346,13 +349,13 @@ public class StubProvider extends DocumentsProvider {
throw new IllegalArgumentException(
"The provided Uri is incorrect, or the file is gone.");
}
if ((document.flags & Document.FLAG_SUPPORTS_TYPED_DOCUMENT) == 0) {
return null;
}
if (!"*/*".equals(mimeTypeFilter)) {
// Not used by DocumentsUI, so don't bother implementing it.
throw new UnsupportedOperationException();
}
if (document.streamTypes == null) {
return null;
}
return document.streamTypes.toArray(new String[document.streamTypes.size()]);
}
@@ -625,6 +628,9 @@ public class StubProvider extends DocumentsProvider {
File file, String mimeType, List<String> streamTypes, StubDocument parent) {
int flags = Document.FLAG_SUPPORTS_DELETE | Document.FLAG_SUPPORTS_WRITE
| Document.FLAG_VIRTUAL_DOCUMENT;
if (streamTypes.size() > 0) {
flags |= Document.FLAG_SUPPORTS_TYPED_DOCUMENT;
}
return new StubDocument(file, mimeType, streamTypes, flags, parent);
}