am c678a93a: Fix issue #2056585: applications can put phone in inconsistent state...

Merge commit 'c678a93a73c83e841032874bee9c202936da73c0' into eclair

* commit 'c678a93a73c83e841032874bee9c202936da73c0':
  Fix issue #2056585: applications can put phone in inconsistent state wrt airplane mode

diff --cc core/res/AndroidManifest.xml
index 608c1ff,cf2184c..35042f1
--- 1/core/res/AndroidManifest.xml
--- 2/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@@ -49,10 -49,9 +49,9 @@@
      <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" />
 -    
 +
      <!-- ====================================== -->
      <!-- Permissions for things that cost money -->
      <!-- ====================================== -->