summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumar@google.com>2009-09-16 14:37:13 -0700
committerJaikumar Ganesh <jaikumar@google.com>2009-09-16 14:56:08 -0700
commit363bd5554e83c29ecdf2ec762f719dea29ffa430 (patch)
tree5f61af8d3d085dbd15e0d37a4681fef0fde792af /AndroidManifest.xml
parentdd1bb33e017a10f800a6da37042a91859acf56e9 (diff)
downloadpackages_apps_settings-363bd5554e83c29ecdf2ec762f719dea29ffa430.zip
packages_apps_settings-363bd5554e83c29ecdf2ec762f719dea29ffa430.tar.gz
packages_apps_settings-363bd5554e83c29ecdf2ec762f719dea29ffa430.tar.bz2
Fix string name for bluetooth pairing and fix NPE
Change-Id: Ibfd0e1e1ed3e1a1e5939d0bdffd17e2e929317b1
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c666871..1ea703c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -444,7 +444,7 @@
android:label="@string/bluetooth_connect_specific_profiles_title" />
<activity android:name=".bluetooth.BluetoothPairingDialog"
- android:label="@string/bluetooth_pairing_dialog"
+ android:label="@string/bluetooth_pairing_request"
android:excludeFromRecents="true"
android:theme="@*android:style/Theme.Dialog.Alert">
<intent-filter>