diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-08-18 11:00:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-08-18 11:00:16 -0700 |
| commit | edc5ff862877d679578cbe9ecbbc806782620968 (patch) | |
| tree | d18f848585c61290e734232da58a7f8182e069b9 /core | |
| parent | 93df578638418ef2f05efdf58331d847f41b17b5 (diff) | |
| parent | c678a93a73c83e841032874bee9c202936da73c0 (diff) | |
| download | frameworks_base-edc5ff862877d679578cbe9ecbbc806782620968.zip frameworks_base-edc5ff862877d679578cbe9ecbbc806782620968.tar.gz frameworks_base-edc5ff862877d679578cbe9ecbbc806782620968.tar.bz2 | |
am c678a93a: Fix issue #2056585: applications can put phone in inconsistent state wrt airplane mode
Merge commit 'c678a93a73c83e841032874bee9c202936da73c0' into eclair
* commit 'c678a93a73c83e841032874bee9c202936da73c0':
Fix issue #2056585: applications can put phone in inconsistent state wrt airplane mode
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/AndroidManifest.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 608c1ff..35042f1d 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -49,7 +49,6 @@ <protected-broadcast android:name="android.intent.action.ACTION_SHUTDOWN" /> <protected-broadcast android:name="android.intent.action.DEVICE_STORAGE_LOW" /> <protected-broadcast android:name="android.intent.action.DEVICE_STORAGE_OK" /> - <protected-broadcast android:name="android.intent.action.AIRPLANE_MODE" /> <protected-broadcast android:name="android.intent.action.NEW_OUTGOING_CALL" /> <protected-broadcast android:name="android.intent.action.REBOOT" /> |