diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-10-29 12:01:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-29 12:01:44 -0700 |
| commit | 91868276294a7541beb8c2162d565a6b42f4dca9 (patch) | |
| tree | 2092b353aeafff2be08f433da51ef66fe420c4b6 /packages/ExternalStorageProvider | |
| parent | e14002b30b4978d7c684a12d439379218250585e (diff) | |
| parent | 66d079bf25ff3f99dbba91e02d392c936238170b (diff) | |
| download | frameworks_base-91868276294a7541beb8c2162d565a6b42f4dca9.zip frameworks_base-91868276294a7541beb8c2162d565a6b42f4dca9.tar.gz frameworks_base-91868276294a7541beb8c2162d565a6b42f4dca9.tar.bz2 | |
am 66d079bf: am f7eb3398: am 19949b9d: Merge "Guard against missing document columns." into klp-dev
* commit '66d079bf25ff3f99dbba91e02d392c936238170b':
Guard against missing document columns.
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; } |