DeskClock: Remove compatibility to old APIsHEADsugisawa-mr1

* We never build on these, so the code and annotations are useless

Change-Id: I791370b531ecadcbddb63ca04d5c4c51aafe1bc1

1 files changed, 1 insertions, 15 deletions

diff --git a/src/com/android/deskclock/ClockFragment.java b/src/com/android/deskclock/ClockFragment.java
index e9654f895..1c6e17826 100644
--- a/src/com/android/deskclock/ClockFragment.java
+++ b/src/com/android/deskclock/ClockFragment.java
@@ -71,9 +71,6 @@ public final class ClockFragment extends DeskClockFragment {
     // Updates the UI in response to changes to the scheduled alarm.
     private BroadcastReceiver mAlarmChangeReceiver;
 
-    // Detects changes to the next scheduled alarm pre-L.
-    private ContentObserver mAlarmObserver;
-
     private TextClock mDigitalClock;
     private AnalogClock mAnalogClock;
     private View mClockFrame;
@@ -93,8 +90,7 @@ public final class ClockFragment extends DeskClockFragment {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mAlarmObserver = Utils.isPreL() ? new AlarmObserverPreL() : null;
-        mAlarmChangeReceiver = Utils.isLOrLater() ? new AlarmChangedBroadcastReceiver() : null;
+        mAlarmChangeReceiver = new AlarmChangedBroadcastReceiver();
     }
 
     @Override
@@ -168,13 +164,6 @@ public final class ClockFragment extends DeskClockFragment {
         }
 
         refreshAlarm();
-
-        // Alarm observer is null on L or later.
-        if (mAlarmObserver != null) {
-            @SuppressWarnings("deprecation")
-            final Uri uri = Settings.System.getUriFor(Settings.System.NEXT_ALARM_FORMATTED);
-            activity.getContentResolver().registerContentObserver(uri, false, mAlarmObserver);
-        }
     }
 
     @Override
@@ -185,9 +174,6 @@ public final class ClockFragment extends DeskClockFragment {
         if (mAlarmChangeReceiver != null) {
             activity.unregisterReceiver(mAlarmChangeReceiver);
         }
-        if (mAlarmObserver != null) {
-            activity.getContentResolver().unregisterContentObserver(mAlarmObserver);
-        }
     }
 
     @Override