drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ad431ad8: Merge change Ia3acc2ee into eclair

Browse Source 
Merge commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60' into eclair-mr2

* commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60':
  Fix pairings lost on reboot.
This commit is contained in:
Jaikumar Ganesh
2009-11-22 22:02:17 -08:00
committed by Android Git Automerger
parent 949c572a16 ad431ad863
commit 8631e55425
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/server/BluetoothEventLoop.java
View File

@ -292,9 +292,9 @@ class BluetoothEventLoop {
mBluetoothService.setProperty(name, propValues[1]);
} else if (name.equals("Pairable") || name.equals("Discoverable")) {
String pairable = name.equals("Pairable") ? propValues[1] :
mBluetoothService.getProperty("Pairable");
mBluetoothService.getPropertyInternal("Pairable");
String discoverable = name.equals("Discoverable") ? propValues[1] :
mBluetoothService.getProperty("Discoverable");
mBluetoothService.getPropertyInternal("Discoverable");
// This shouldn't happen, unless Adapter Properties are null.
if (pairable == null || discoverable == null)

14
core/java/android/server/BluetoothService.java
View File

@ -531,7 +531,7 @@ public class BluetoothService extends IBluetooth.Stub {
return;
}
String []bonds = null;
String val = getProperty("Devices");
String val = getPropertyInternal("Devices");
if (val != null) {
bonds = val.split(",");
}
@ -681,7 +681,6 @@ public class BluetoothService extends IBluetooth.Stub {
/*package*/synchronized void getAllProperties() {
mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
if (!isEnabledInternal()) return;
mAdapterProperties.clear();
String properties[] = (String [])getAdapterPropertiesNative();
@ -806,7 +805,12 @@ public class BluetoothService extends IBluetooth.Stub {
return true;
}
/*package*/ synchronized String getProperty (String name) {
/*package*/ synchronized String getProperty(String name) {
if (!isEnabledInternal()) return null;
return getPropertyInternal(name);
}
/*package*/ synchronized String getPropertyInternal(String name) {
if (!mAdapterProperties.isEmpty())
return mAdapterProperties.get(name);
getAllProperties();
@ -1639,7 +1643,7 @@ public class BluetoothService extends IBluetooth.Stub {
}
/*package*/ String getAddressFromObjectPath(String objectPath) {
String adapterObjectPath = getProperty("ObjectPath");
String adapterObjectPath = getPropertyInternal("ObjectPath");
if (adapterObjectPath == null || objectPath == null) {
Log.e(TAG, "getAddressFromObjectPath: AdpaterObjectPath:" + adapterObjectPath +
" or deviceObjectPath:" + objectPath + " is null");
@ -1659,7 +1663,7 @@ public class BluetoothService extends IBluetooth.Stub {
}
/*package*/ String getObjectPathFromAddress(String address) {
String path = getProperty("ObjectPath");
String path = getPropertyInternal("ObjectPath");
if (path == null) {
Log.e(TAG, "Error: Object Path is null");
return null;

BIN
core/jni/.android_server_BluetoothEventLoop.cpp.swp
View File

Binary file not shown.