Create AlarmObserverPreL in onCreate

Bug: 26484535
Change-Id: I32e8f1c5f8620109affc25e3bb4a826856759eec

1 files changed, 13 insertions, 12 deletions

diff --git a/src/com/android/deskclock/ClockFragment.java b/src/com/android/deskclock/ClockFragment.java
index d481a680d..c9b339fb9 100644
--- a/src/com/android/deskclock/ClockFragment.java
+++ b/src/com/android/deskclock/ClockFragment.java
@@ -57,24 +57,24 @@ import static java.util.Calendar.DAY_OF_WEEK;
  */
 public final class ClockFragment extends DeskClockFragment {
 
-    private TextClock mDigitalClock;
-    private View mAnalogClock, mClockFrame;
-    private SelectedCitiesAdapter mCityAdapter;
-    private ListView mCityList;
-    private String mDateFormat;
-    private String mDateFormatForAccessibility;
-
     // Updates the UI in response to system setting changes that alter time values and time display.
     private final BroadcastReceiver mBroadcastReceiver = new SystemBroadcastReceiver();
 
-    // Detects changes to the next scheduled alarm pre-L.
-    private final ContentObserver mAlarmObserver = Utils.isPreL() ? new AlarmObserverPreL() : null;
-
     // Updates dates in the UI on every quarter-hour.
     private final Runnable mQuarterHourUpdater = new QuarterHourRunnable();
 
+    // Detects changes to the next scheduled alarm pre-L.
+    private ContentObserver mAlarmObserver;
+
     private Handler mHandler;
 
+    private TextClock mDigitalClock;
+    private View mAnalogClock, mClockFrame;
+    private SelectedCitiesAdapter mCityAdapter;
+    private ListView mCityList;
+    private String mDateFormat;
+    private String mDateFormatForAccessibility;
+
     /** The public no-arg constructor required by all fragments. */
     public ClockFragment() {}
 
@@ -83,6 +83,7 @@ public final class ClockFragment extends DeskClockFragment {
         super.onCreate(savedInstanceState);
 
         mHandler = new Handler();
+        mAlarmObserver = Utils.isPreL() ? new AlarmObserverPreL(mHandler) : null;
     }
 
     @Override
@@ -292,8 +293,8 @@ public final class ClockFragment extends DeskClockFragment {
      * {@link AlarmManager#ACTION_NEXT_ALARM_CLOCK_CHANGED}.
      */
     private final class AlarmObserverPreL extends ContentObserver {
-        public AlarmObserverPreL() {
-            super(mHandler);
+        public AlarmObserverPreL(Handler handler) {
+            super(handler);
         }
 
         @Override