summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-07-10 17:38:29 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-07-10 17:38:29 -0700
commitcf29e116129f38309c18ba14b9893b079a712289 (patch)
tree441bbf53c5c67b73167800efbbe39dc5f20231c0 /core/java
parentf6c968395f9c78552763e8f2994a57cf5c6bc0c0 (diff)
parent4554f30c834723db6946400bf1827be4419a3134 (diff)
downloadframeworks_base-cf29e116129f38309c18ba14b9893b079a712289.zip
frameworks_base-cf29e116129f38309c18ba14b9893b079a712289.tar.gz
frameworks_base-cf29e116129f38309c18ba14b9893b079a712289.tar.bz2
Merge change 6867 into donut
* changes: CLOSE_SYSTEM_DIALOGS can't be protected.
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/content/Intent.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 7615614..9202b9a 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -1202,9 +1202,6 @@ public class Intent implements Parcelable {
* Broadcast Action: This is broadcast when a user action should request a
* temporary system dialog to dismiss. Some examples of temporary system
* dialogs are the notification window-shade and the recent tasks dialog.
- *
- * <p class="note">This is a protected intent that can only be sent
- * by the system.
*/
public static final String ACTION_CLOSE_SYSTEM_DIALOGS = "android.intent.action.CLOSE_SYSTEM_DIALOGS";
/**