commit ba8129f1b15de500f46bd2adee251bf5d8bf5bbd
author Jeff Sharkey <jsharkey@android.com> Thu Sep 19 11:30:47 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 19 11:30:47 2013 -0700
tree a41ff304c8899cb211d478a34eae08a2ad4dd849
parent 5de6787d1e90991af85d677bf38e242fcba427a1
parent 18b94817a452081f6756cd30be9414c496fa1ca7

am 18b94817: Merge "Also catch one more tablet layout NPE." into klp-dev

* commit '18b94817a452081f6756cd30be9414c496fa1ca7':
  Also catch one more tablet layout NPE.

packages/DocumentsUI/src/com/android/documentsui/RecentsCreateFragment.java

diff --git a/packages/DocumentsUI/src/com/android/documentsui/RecentsCreateFragment.java b/packages/DocumentsUI/src/com/android/documentsui/RecentsCreateFragment.java
index 140373b..b533925 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/RecentsCreateFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/RecentsCreateFragment.java
@@ -206,7 +206,7 @@
             title.setText(builder);
             title.setEllipsize(TruncateAt.MIDDLE);
 
-            line2.setVisibility(View.GONE);
+            if (line2 != null) line2.setVisibility(View.GONE);
 
             return convertView;
         }