commit 85e3cef67e8d775afa8b08e8bffdd77fac007762
author Sara Ting <sarating@google.com> Sun Apr 29 22:41:56 2012 -0700
committer Sara Ting <sarating@google.com> Sun Apr 29 22:41:56 2012 -0700
tree f0b5bd16b4a469f6ee33a5768c9f52e102db89b7
parent 0c0da940484dc8966576634475daa126b4a6ede2

Fix NPE in Utils.matrixCursorFromCursor().

Bug: 6145376
Change-Id: I91f50431fa9311f64608cdc0438efe5b7b598ae4

src/com/android/calendar/Utils.java

diff --git a/src/com/android/calendar/Utils.java b/src/com/android/calendar/Utils.java
index 5324551..c8944d8 100644
--- a/src/com/android/calendar/Utils.java
+++ b/src/com/android/calendar/Utils.java
@@ -285,7 +285,11 @@
     }
 
     public static MatrixCursor matrixCursorFromCursor(Cursor cursor) {
-        MatrixCursor newCursor = new MatrixCursor(cursor.getColumnNames());
+        String[] columnNames = cursor.getColumnNames();
+        if (columnNames == null) {
+            columnNames = new String[] {};
+        }
+        MatrixCursor newCursor = new MatrixCursor(columnNames);
         int numColumns = cursor.getColumnCount();
         String data[] = new String[numColumns];
         cursor.moveToPosition(-1);