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

Merge "Check the bluetooth state for getUuid call" into ics-mr0

Browse Source
This commit is contained in:
Matthew Xie
2011-11-16 15:31:03 -08:00
committed by Android (Google) Code Review
parent d28bb28e08 44b58ab89e
commit 6da97a24e3
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/bluetooth/BluetoothAdapter.java
View File

@ -533,6 +533,7 @@ public final class BluetoothAdapter {
* @hide * @hide
*/ */
public ParcelUuid[] getUuids() { public ParcelUuid[] getUuids() {
if (getState() != STATE_ON) return null;
try { try {
return mService.getUuids(); return mService.getUuids();
} catch (RemoteException e) {Log.e(TAG, "", e);} } catch (RemoteException e) {Log.e(TAG, "", e);}

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

@ -809,7 +809,7 @@ public class BluetoothService extends IBluetooth.Stub {
} }
} }
/*package*/ synchronized String getProperty(String name, boolean checkState) { /*package*/ String getProperty(String name, boolean checkState) {
// If checkState is false, check if the event loop is running. // If checkState is false, check if the event loop is running.
// before making the call to Bluez // before making the call to Bluez
if (checkState) { if (checkState) {
@ -853,14 +853,14 @@ public class BluetoothService extends IBluetooth.Stub {
return getProperty("Name", false); return getProperty("Name", false);
} }
public synchronized ParcelUuid[] getUuids() { public ParcelUuid[] getUuids() {
mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission"); mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
String value = getProperty("UUIDs", true); String value = getProperty("UUIDs", true);
if (value == null) return null; if (value == null) return null;
return convertStringToParcelUuid(value); return convertStringToParcelUuid(value);
} }
private synchronized ParcelUuid[] convertStringToParcelUuid(String value) { private ParcelUuid[] convertStringToParcelUuid(String value) {
String[] uuidStrings = null; String[] uuidStrings = null;
// The UUIDs are stored as a "," separated string. // The UUIDs are stored as a "," separated string.
uuidStrings = value.split(","); uuidStrings = value.split(",");
@ -933,7 +933,7 @@ public class BluetoothService extends IBluetooth.Stub {
* @return The discoverability window of the device, in seconds. A negative * @return The discoverability window of the device, in seconds. A negative
* value indicates an error. * value indicates an error.
*/ */
public synchronized int getDiscoverableTimeout() { public int getDiscoverableTimeout() {
mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission"); mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
String timeout = getProperty("DiscoverableTimeout", true); String timeout = getProperty("DiscoverableTimeout", true);
if (timeout != null) if (timeout != null)
@ -942,7 +942,7 @@ public class BluetoothService extends IBluetooth.Stub {
return -1; return -1;
} }
public synchronized int getScanMode() { public int getScanMode() {
mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission"); mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
if (!isEnabledInternal()) if (!isEnabledInternal())
return BluetoothAdapter.SCAN_MODE_NONE; return BluetoothAdapter.SCAN_MODE_NONE;
@ -968,7 +968,7 @@ public class BluetoothService extends IBluetooth.Stub {
return stopDiscoveryNative(); return stopDiscoveryNative();
} }
public synchronized boolean isDiscovering() { public boolean isDiscovering() {
mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission"); mContext.enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
String discoveringProperty = getProperty("Discovering", false); String discoveringProperty = getProperty("Discovering", false);
@ -2384,7 +2384,7 @@ public class BluetoothService extends IBluetooth.Stub {
mDeviceProfileState.remove(address); mDeviceProfileState.remove(address);
} }
synchronized String[] getKnownDevices() { String[] getKnownDevices() {
String[] bonds = null; String[] bonds = null;
String val = getProperty("Devices", true); String val = getProperty("Devices", true);
if (val != null) { if (val != null) {