summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuben <rglez@google.com>2014-05-30 20:27:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-30 20:27:40 +0000
commit0d054b8bb7727bb8645da22ebd97a3dc211e47f9 (patch)
tree40a697177ae8f5ac813165d7372391f8cc604e8b
parentb1815cfca0c27ad8e97dff1d3d453cca280eb19e (diff)
parenta73a6ae9b11350744c8820ed583f79ecd97fc426 (diff)
downloadandroid_frameworks_opt_datetimepicker-0d054b8bb7727bb8645da22ebd97a3dc211e47f9.tar.gz
android_frameworks_opt_datetimepicker-0d054b8bb7727bb8645da22ebd97a3dc211e47f9.tar.bz2
android_frameworks_opt_datetimepicker-0d054b8bb7727bb8645da22ebd97a3dc211e47f9.zip
am a73a6ae9: am f455054e: am e0a0cb28: Check if mController is null
* commit 'a73a6ae9b11350744c8820ed583f79ecd97fc426': Check if mController is null
-rw-r--r--src/com/android/datetimepicker/date/MonthView.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/datetimepicker/date/MonthView.java b/src/com/android/datetimepicker/date/MonthView.java
index 1924890..270256c 100644
--- a/src/com/android/datetimepicker/date/MonthView.java
+++ b/src/com/android/datetimepicker/date/MonthView.java
@@ -576,6 +576,9 @@ public abstract class MonthView extends View {
}
private boolean isBeforeMin(int year, int month, int day) {
+ if (mController == null) {
+ return false;
+ }
Calendar minDate = mController.getMinDate();
if (minDate == null) {
return false;
@@ -601,6 +604,9 @@ public abstract class MonthView extends View {
}
private boolean isAfterMax(int year, int month, int day) {
+ if (mController == null) {
+ return false;
+ }
Calendar maxDate = mController.getMaxDate();
if (maxDate == null) {
return false;