diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-10-29 11:48:26 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2013-10-29 11:48:30 -0700 |
| commit | 5d321d472d9983db52610393e6506e2b2d2da4bf (patch) | |
| tree | b6c64ec9638c2b44c840d5f95118863cb3313ec7 /packages/ExternalStorageProvider | |
| parent | ac5d3827409dff757531347c5232bb34ea727274 (diff) | |
| download | frameworks_base-5d321d472d9983db52610393e6506e2b2d2da4bf.zip frameworks_base-5d321d472d9983db52610393e6506e2b2d2da4bf.tar.gz frameworks_base-5d321d472d9983db52610393e6506e2b2d2da4bf.tar.bz2 | |
Guard against missing document columns.
When filtering and sorting, guard against missing columns to avoid
crashing entire app.
Bug: 11377065
Change-Id: I04f035c918d743bcc84592f05e3ef9ad0ebfadce
Diffstat (limited to 'packages/ExternalStorageProvider')
| -rw-r--r-- | packages/ExternalStorageProvider/src/com/android/externalstorage/TestDocumentsProvider.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/TestDocumentsProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/TestDocumentsProvider.java index af6ff01..8eb70e9 100644 --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/TestDocumentsProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/TestDocumentsProvider.java @@ -57,6 +57,9 @@ public class TestDocumentsProvider extends DocumentsProvider { private static final boolean LAG = false; + private static final boolean ROOT_LAME_PROJECTION = false; + private static final boolean DOCUMENT_LAME_PROJECTION = false; + private static final boolean ROOTS_WEDGE = false; private static final boolean ROOTS_CRASH = false; private static final boolean ROOTS_REFRESH = false; @@ -88,10 +91,12 @@ public class TestDocumentsProvider extends DocumentsProvider { }; private static String[] resolveRootProjection(String[] projection) { + if (ROOT_LAME_PROJECTION) return new String[0]; return projection != null ? projection : DEFAULT_ROOT_PROJECTION; } private static String[] resolveDocumentProjection(String[] projection) { + if (DOCUMENT_LAME_PROJECTION) return new String[0]; return projection != null ? projection : DEFAULT_DOCUMENT_PROJECTION; } |