Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fd80b58 authored by Robyn Coultas's avatar Robyn Coultas
Browse files

Guarding new SDK19 code 

Change-Id: I802e56d859c935d6492bae54eccb15d17fc3f840
parent 758e2df9

src/com/android/deskclock/Alarms.java

+5 −1
Original line number Diff line number Diff line
@@ -436,7 +436,11 @@ public class Alarms { 
        PendingIntent sender = PendingIntent.getBroadcast(

                context, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT);



        if (Utils.isKeyLimePieOrLater()) {

            am.setExact(AlarmManager.RTC_WAKEUP, atTimeInMillis, sender);

        } else {

            am.set(AlarmManager.RTC_WAKEUP, atTimeInMillis, sender);

        }



        setStatusBarIcon(context, true);

src/com/android/deskclock/Utils.java

+8 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.graphics.Paint; 
import android.graphics.PorterDuff;

import android.graphics.PorterDuffColorFilter;

import android.net.Uri;

import android.os.Build;

import android.os.Handler;

import android.os.SystemClock;

import android.preference.PreferenceManager;
@@ -90,6 +91,13 @@ public class Utils { 
    public final static String HOURS = "h";

    public final static String MINUTES = ":mm";



    /**

     * Returns whether the SDK is the KeyLimePie release or later.

     */

    public static boolean isKeyLimePieOrLater() {

        return Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN_MR2;

    }





    public static void prepareHelpMenuItem(Context context, MenuItem helpMenuItem) {

        String helpUrlString = context.getResources().getString(R.string.desk_clock_help_url);

src/com/android/deskclock/timer/TimerReceiver.java

+10 −2
Original line number Diff line number Diff line
@@ -167,7 +167,11 @@ public class TimerReceiver extends BroadcastReceiver { 
        PendingIntent p = PendingIntent.getBroadcast(context,

                0, intent, PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);

        if (t != null) {

            if (Utils.isKeyLimePieOrLater()) {

                mngr.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, nextTimesup, p);

            } else {

                mngr.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, nextTimesup, p);

            }

            Log.d(TAG,"Setting times up to " + nextTimesup);

        } else {

            Log.d(TAG,"canceling times up");
@@ -269,7 +273,11 @@ public class TimerReceiver extends BroadcastReceiver { 
                PendingIntent.getBroadcast(context, 0, nextBroadcast, 0);

        AlarmManager alarmManager =

                (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);

        if (Utils.isKeyLimePieOrLater()) {

            alarmManager.setExact(AlarmManager.ELAPSED_REALTIME, nextBroadcastTime, pendingNextBroadcast);

        } else {

            alarmManager.set(AlarmManager.ELAPSED_REALTIME, nextBroadcastTime, pendingNextBroadcast);

        }

    }



    private static void showCollapsedNotification(final Context context, String title, String text,