diff options
| author | Paul Sliwowski <psliwowski@google.com> | 2013-06-18 15:44:46 -0700 |
|---|---|---|
| committer | Paul Sliwowski <psliwowski@google.com> | 2013-06-18 15:46:00 -0700 |
| commit | 5f86971de41a70d81355e0fad2443a9efb0f6fb8 (patch) | |
| tree | 9938c1dbb9af494bf23afa9e6b16ab69b9257588 /src/com/android/calendar | |
| parent | a0b14abb2b333c72d8be3fe7f8282837961341d2 (diff) | |
| download | android_packages_apps_Calendar-5f86971de41a70d81355e0fad2443a9efb0f6fb8.tar.gz android_packages_apps_Calendar-5f86971de41a70d81355e0fad2443a9efb0f6fb8.tar.bz2 android_packages_apps_Calendar-5f86971de41a70d81355e0fad2443a9efb0f6fb8.zip | |
Fix mokey NullPointerException when there is no colors to save.
Bug: 9479905
Change-Id: I6fd445a2e1ad30741102561c87a7385e9a91e887
Diffstat (limited to 'src/com/android/calendar')
| -rw-r--r-- | src/com/android/calendar/CalendarColorPickerDialog.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/calendar/CalendarColorPickerDialog.java b/src/com/android/calendar/CalendarColorPickerDialog.java index 9427610d..e72d1962 100644 --- a/src/com/android/calendar/CalendarColorPickerDialog.java +++ b/src/com/android/calendar/CalendarColorPickerDialog.java @@ -173,6 +173,10 @@ public class CalendarColorPickerDialog extends ColorPickerDialog { } private void saveColorKeys(Bundle outState) { + // No color keys to save, so just return + if (mColors == null) { + return; + } int[] colorKeys = new int[mColors.length]; for (int i = 0; i < mColors.length; i++) { colorKeys[i] = mColorKeyMap.get(mColors[i]); |