From 4d1ad994d371d1a9ca6af67fa398b793657c9c39 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Tue, 8 Mar 2016 18:48:47 -0500
Subject: [PATCH] Set DatePickerListener last during DatePickerDialog
 construction

Prevents us from calling the listener before we're fully set up.

Bug: 27475444
Change-Id: I0def384b60c09c44d36e60503ddb8434055dfb6f
---
 core/java/android/app/DatePickerDialog.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/java/android/app/DatePickerDialog.java b/core/java/android/app/DatePickerDialog.java
index bbf1607ad5299..83dc506371cf5 100644
--- a/core/java/android/app/DatePickerDialog.java
+++ b/core/java/android/app/DatePickerDialog.java
@@ -125,9 +125,8 @@ public class DatePickerDialog extends AlertDialog implements OnClickListener,
             @Nullable OnDateSetListener listener, int year, int month, int dayOfMonth) {
         this(context, themeResId);
 
-        mDateSetListener = listener;
-
         mDatePicker.updateDate(year, month, dayOfMonth);
+        mDateSetListener = listener;
     }
 
     static @StyleRes int resolveDialogTheme(@NonNull Context context, @StyleRes int themeResId) {