From c545799b80344a8747865627427bea746b6f28cb Mon Sep 17 00:00:00 2001
From: Christine Franks <christyfranks@google.com>
Date: Wed, 8 Nov 2017 14:16:03 -0800
Subject: [PATCH] Promote ACTION_DISMISS_TIMER to public API

Bug: 69047776
Test: make -j100 && make cts -j10 && cts-tradefed run cts-dev -m
CtsAlarmClockTestCases

Change-Id: I1fedb6e36c83008ad590602af1b4e06688cc116f
---
 api/current.txt                            | 1 +
 core/java/android/provider/AlarmClock.java | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/current.txt b/api/current.txt
index c1188dcd330b3..764073b10a912 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -33129,6 +33129,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";
diff --git a/core/java/android/provider/AlarmClock.java b/core/java/android/provider/AlarmClock.java
index f9030124cc63a..21694575631aa 100644
--- a/core/java/android/provider/AlarmClock.java
+++ b/core/java/android/provider/AlarmClock.java
@@ -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";