commit b2a3dd88a53cc8c6d19f6dc8ec4f3d6c4abd9b54
author The Android Open Source Project <initial-contribution@android.com> Mon Mar 09 11:52:12 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Mon Mar 09 11:52:12 2009 -0700
tree e167affc928677f3dd70e173150a77e3943e97a9
parent f5b4b98fada53d91c4c2ebeb5a1d33ccc95c94d2

auto import from //branches/cupcake/...@137197

core/java/android/content/Intent.java

diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index e1c1f64..824fd9b 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -1042,6 +1042,14 @@
      */
     @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
     public static final String ACTION_SCREEN_ON = "android.intent.action.SCREEN_ON";
+
+    /**
+     * Broadcast Action: Sent when the user is present after device wakes up (e.g when the 
+     * keyguard is gone).
+     */
+    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
+    public static final String ACTION_USER_PRESENT= "android.intent.action.USER_PRESENT";
+
     /**
      * Broadcast Action: The current time has changed.  Sent every
      * minute.  You can <em>not</em> receive this through components declared