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

Commit e5d74ccc authored by Christine Franks's avatar Christine Franks Committed by Android (Google) Code Review
Browse files

Merge "Promote ACTION_DISMISS_TIMER to public API"

parents e9634c5c c545799b

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -33140,6 +33140,7 @@ package android.provider { 
  public final class AlarmClock {

    ctor public AlarmClock();

    field public static final java.lang.String ACTION_DISMISS_ALARM = "android.intent.action.DISMISS_ALARM";

    field public static final java.lang.String ACTION_DISMISS_TIMER = "android.intent.action.DISMISS_TIMER";

    field public static final java.lang.String ACTION_SET_ALARM = "android.intent.action.SET_ALARM";

    field public static final java.lang.String ACTION_SET_TIMER = "android.intent.action.SET_TIMER";

    field public static final java.lang.String ACTION_SHOW_ALARMS = "android.intent.action.SHOW_ALARMS";

core/java/android/provider/AlarmClock.java

+0 −1
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ public final class AlarmClock { 
     * <p>

     * Dismiss all currently expired timers. If there are no expired timers, then this is a no-op.

     * </p>

     * @hide

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_DISMISS_TIMER = "android.intent.action.DISMISS_TIMER";