summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2013-05-03 23:33:09 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-05-03 23:33:09 +0000
commitfaa47b526fc35be01b1bc46a78679adde87f6701 (patch)
tree4d0c6a685e7d2cf110c5016686b1184b2ca5e81f /core/java/android
parent62159c0d854737f8dc519fba01fd28adea26e57f (diff)
parent6a08a12b8e8ef6fa04932c7a1c5255e3f158a3c8 (diff)
downloadframeworks_base-faa47b526fc35be01b1bc46a78679adde87f6701.zip
frameworks_base-faa47b526fc35be01b1bc46a78679adde87f6701.tar.gz
frameworks_base-faa47b526fc35be01b1bc46a78679adde87f6701.tar.bz2
Merge "Idle maintenance scheduling broken." into jb-mr2-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/Intent.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 67bd952..bfc7bf5 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -2356,6 +2356,8 @@ public class Intent implements Parcelable, Cloneable {
* </p>
*
* @see #ACTION_IDLE_MAINTENANCE_END
+ *
+ * @hide
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_IDLE_MAINTENANCE_START =
@@ -2383,6 +2385,8 @@ public class Intent implements Parcelable, Cloneable {
* by the system.
*
* @see #ACTION_IDLE_MAINTENANCE_START
+ *
+ * @hide
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_IDLE_MAINTENANCE_END =