Merge "Fixed NPE in matrixCursorFromCursor" into ics-ub-calendar-aqua

1 files changed, 6 insertions, 2 deletions

diff --git a/src/com/android/calendar/Utils.java b/src/com/android/calendar/Utils.java
index 42a2891c..f301324b 100644
--- a/src/com/android/calendar/Utils.java
+++ b/src/com/android/calendar/Utils.java
@@ -264,8 +264,8 @@ public class Utils {
     public static void setSharedPreference(Context context, String key, String[] values) {
         SharedPreferences prefs = GeneralPreferences.getSharedPreferences(context);
         LinkedHashSet<String> set = new LinkedHashSet<String>();
-        for (int i = 0; i < values.length; i++) {
-            set.add(values[i]);
+        for (String value : values) {
+            set.add(value);
         }
         prefs.edit().putStringSet(key, set).apply();
     }
@@ -321,6 +321,10 @@ public class Utils {
     }
 
     public static MatrixCursor matrixCursorFromCursor(Cursor cursor) {
+        if (cursor == null) {
+            return null;
+        }
+
         String[] columnNames = cursor.getColumnNames();
         if (columnNames == null) {
             columnNames = new String[] {};