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

Merge change Ia3acc2ee into eclair

Browse Source 
* changes:
  Fix pairings lost on reboot.
This commit is contained in:
Android (Google) Code Review
2009-11-22 21:54:29 -08:00
parent e7800946a4 b148bc844e
commit ad431ad863
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]); mBluetoothService.setProperty(name, propValues[1]);
} else if (name.equals("Pairable") || name.equals("Discoverable")) { } else if (name.equals("Pairable") || name.equals("Discoverable")) {
String pairable = name.equals("Pairable") ? propValues[1] : String pairable = name.equals("Pairable") ? propValues[1] :
mBluetoothService.getProperty("Pairable"); mBluetoothService.getPropertyInternal("Pairable");
String discoverable = name.equals("Discoverable") ? propValues[1] : String discoverable = name.equals("Discoverable") ? propValues[1] :
mBluetoothService.getProperty("Discoverable"); mBluetoothService.getPropertyInternal("Discoverable");
// This shouldn't happen, unless Adapter Properties are null. // This shouldn't happen, unless Adapter Properties are null.
if (pairable == null || discoverable == null) if (pairable == null || discoverable == null)

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

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

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

Binary file not shown.