diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-11-16 15:01:23 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-11-16 15:01:23 -0800 |
| commit | 3ada4b5a85fa907989855065179c4661653cd9ad (patch) | |
| tree | 6f461e770d8a22dfc0d26c8917086df4c31d5905 /packages/DocumentsUI | |
| parent | 5ceb8731615dbbd54e027e09e46e724037e3a809 (diff) | |
| parent | 5ccaaff4818af8d48e072cbd2b8b784e5cd0c593 (diff) | |
| download | frameworks_base-3ada4b5a85fa907989855065179c4661653cd9ad.zip frameworks_base-3ada4b5a85fa907989855065179c4661653cd9ad.tar.gz frameworks_base-3ada4b5a85fa907989855065179c4661653cd9ad.tar.bz2 | |
Merge branch 'LA.BF64.1.2.2_rb4.7' of git://codeaurora.org/platform/frameworks/base into cm-13.0
Change-Id: I008f052e4e27b44457c8343d20f6e1ba943c8e1f
Diffstat (limited to 'packages/DocumentsUI')
| -rw-r--r-- | packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java index 006f6e9..ffdf0a7 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java @@ -527,8 +527,10 @@ public class DirectoryFragment extends Fragment { for (int i = 0; i < size; i++) { if (checked.valueAt(i)) { final Cursor cursor = mAdapter.getItem(checked.keyAt(i)); - final DocumentInfo doc = DocumentInfo.fromDirectoryCursor(cursor); - docs.add(doc); + if (cursor != null) { + final DocumentInfo doc = DocumentInfo.fromDirectoryCursor(cursor); + docs.add(doc); + } } } |