summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2009-09-11 11:41:59 -0700
committerNick Pelly <npelly@google.com>2009-09-11 11:41:59 -0700
commit5ddbd94df68fae64764ce2b801bfdf613e349c35 (patch)
tree12982f5772c8e9fcd8403108c0843cb78967f8a3 /AndroidManifest.xml
parent16cc86315d7a8e1f6a0f3083d0a810a7cb097832 (diff)
downloadpackages_apps_settings-5ddbd94df68fae64764ce2b801bfdf613e349c35.zip
packages_apps_settings-5ddbd94df68fae64764ce2b801bfdf613e349c35.tar.gz
packages_apps_settings-5ddbd94df68fae64764ce2b801bfdf613e349c35.tar.bz2
Update AndroidManifest.xml for new Intent locations.
This will fix a regression since the recent BT API changes. The settings app would have missed some Bluetooth events, especially pairing. Change-Id: Ia5e6371279feb389578e798fe11f1c239a4aa17b
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 590f4b3..7d85aa4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -126,7 +126,7 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
- <action android:name="android.bluetooth.intent.action.DEVICE_PICKER" />
+ <action android:name="android.bluetooth.devicepicker.action.LAUNCH" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
@@ -448,15 +448,15 @@
android:excludeFromRecents="true"
android:theme="@*android:style/Theme.Dialog.Alert">
<intent-filter>
- <action android:name="android.bluetooth.intent.action.PAIRING_REQUEST" />
+ <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<receiver android:name=".bluetooth.BluetoothPairingRequest">
<intent-filter>
- <action android:name="android.bluetooth.intent.action.PAIRING_REQUEST" />
- <action android:name="android.bluetooth.intent.action.PAIRING_CANCEL" />
+ <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
+ <action android:name="android.bluetooth.device.action.PAIRING_CANCEL" />
</intent-filter>
</receiver>
@@ -610,7 +610,7 @@
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
<action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
<action android:name="android.net.conn.BACKGROUND_DATA_SETTING_CHANGED" />
- <action android:name="android.bluetooth.intent.action.BLUETOOTH_STATE_CHANGED" />
+ <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
<action android:name="android.intent.action.CLOSE_SYSTEM_DIALOGS" /> <!-- pick up misc changes -->
</intent-filter>
<meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />