diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-12 21:56:02 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-07-12 21:56:02 -0700 |
| commit | 602bee5bf2a4f688b050077291288b473a7cc6db (patch) | |
| tree | 35bbd76ae1d7b874c9ade5b566a3034c2e21519b /core | |
| parent | 5b93050d484e602f5e716f60a33e7e4dc4619e0b (diff) | |
| parent | cf29e116129f38309c18ba14b9893b079a712289 (diff) | |
| download | frameworks_base-602bee5bf2a4f688b050077291288b473a7cc6db.zip frameworks_base-602bee5bf2a4f688b050077291288b473a7cc6db.tar.gz frameworks_base-602bee5bf2a4f688b050077291288b473a7cc6db.tar.bz2 | |
am cf29e116: Merge change 6867 into donut
Merge commit 'cf29e116129f38309c18ba14b9893b079a712289'
* commit 'cf29e116129f38309c18ba14b9893b079a712289':
CLOSE_SYSTEM_DIALOGS can't be protected.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/Intent.java | 3 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 80d7afe..54d2e76 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"; /** diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index dfa26f3..027fb23 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -32,7 +32,6 @@ <protected-broadcast android:name="android.intent.action.TIME_TICK" /> <protected-broadcast android:name="android.intent.action.TIMEZONE_CHANGED" /> <protected-broadcast android:name="android.intent.action.BOOT_COMPLETED" /> - <protected-broadcast android:name="android.intent.action.CLOSE_SYSTEM_DIALOGS" /> <protected-broadcast android:name="android.intent.action.PACKAGE_INSTALL" /> <protected-broadcast android:name="android.intent.action.PACKAGE_ADDED" /> <protected-broadcast android:name="android.intent.action.PACKAGE_REPLACED" /> |