Merge "Ensure that no callback is invoked while initializing DatePicker" into honeycomb

1 files changed, 2 insertions, 0 deletions

diff --git a/core/java/android/widget/DatePicker.java b/core/java/android/widget/DatePicker.java
index dbcf1e90cfd6..4d63cf4e30a1 100644
--- a/core/java/android/widget/DatePicker.java
+++ b/core/java/android/widget/DatePicker.java
@@ -471,6 +471,8 @@ public class DatePicker extends FrameLayout {
      */
     public void init(int year, int monthOfYear, int dayOfMonth,
             OnDateChangedListener onDateChangedListener) {
+        // make sure there is no callback
+        mOnDateChangedListener = null;
         updateDate(year, monthOfYear, dayOfMonth);
         // register the callback after updating the date
         mOnDateChangedListener = onDateChangedListener;