PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bb334392: Merge change 25354 into eclair

Browse Source 
Merge commit 'bb3343923c640461eecc4fac25f911224a16d056' into eclair-plus-aosp

* commit 'bb3343923c640461eecc4fac25f911224a16d056':
  Fix string name for bluetooth pairing and fix NPE
This commit is contained in:
Jaikumar Ganesh
2009-09-17 08:41:11 -07:00
committed by Android Git Automerger
parent 5bfc786ebe bb3343923c
commit e60a8ebd0e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -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>

3
src/com/android/settings/bluetooth/LocalBluetoothManager.java
View File

@@ -256,7 +256,8 @@ public class LocalBluetoothManager {
CachedBluetoothDevice cachedDevice = mCachedDeviceManager.findDevice(device);
String name = null;
if (cachedDevice == null) {
name = device.getName();
if (device != null) name = device.getName();
if (name == null) {
name = mContext.getString(R.string.bluetooth_remote_device);
}