From fa4939e2f02b92e9b18dc933282a968597781ecb Mon Sep 17 00:00:00 2001
From: Christine Franks <christyfranks@google.com>
Date: Thu, 7 Dec 2017 15:30:37 -0800
Subject: [PATCH] Change selection strategy for ACTION_DISMISS_TIMER

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

Change-Id: Ic7e3e6f32c873d62d52e39873401e3e8f2f39a0a
---
 core/java/android/provider/AlarmClock.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/java/android/provider/AlarmClock.java b/core/java/android/provider/AlarmClock.java
index 21694575631aa..7ad9e013c6171 100644
--- a/core/java/android/provider/AlarmClock.java
+++ b/core/java/android/provider/AlarmClock.java
@@ -154,9 +154,12 @@ public final class AlarmClock {
     public static final String ACTION_SET_TIMER = "android.intent.action.SET_TIMER";
 
     /**
-     * Activity Action: Dismiss timers.
+     * Activity Action: Dismiss a timer.
      * <p>
-     * Dismiss all currently expired timers. If there are no expired timers, then this is a no-op.
+     * The timer to dismiss should be specified using the Intent's data URI, which represents a
+     * deeplink to the timer.
+     * </p><p>
+     * If no data URI is provided, dismiss all expired timers.
      * </p>
      */
     @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)