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

Merge "Check whether Bluetooth is enabled before making any API calls." into gingerbread

Browse Source
This commit is contained in:
Jaikumar Ganesh
2010-08-09 13:50:28 -07:00
committed by Android (Google) Code Review
parent 959909ef28 f5ff170be1
commit cbaef51847
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -474,6 +474,7 @@ public final class BluetoothAdapter {
* @return true if the name was set, false otherwise * @return true if the name was set, false otherwise
*/ */
public boolean setName(String name) { public boolean setName(String name) {
if (getState() != STATE_ON) return false;
try { try {
return mService.setName(name); return mService.setName(name);
} catch (RemoteException e) {Log.e(TAG, "", e);} } catch (RemoteException e) {Log.e(TAG, "", e);}
@ -493,6 +494,7 @@ public final class BluetoothAdapter {
* @return scan mode * @return scan mode
*/ */
public int getScanMode() { public int getScanMode() {
if (getState() != STATE_ON) return SCAN_MODE_NONE;
try { try {
return mService.getScanMode(); return mService.getScanMode();
} catch (RemoteException e) {Log.e(TAG, "", e);} } catch (RemoteException e) {Log.e(TAG, "", e);}
@ -524,6 +526,7 @@ public final class BluetoothAdapter {
* @hide * @hide
*/ */
public boolean setScanMode(int mode, int duration) { public boolean setScanMode(int mode, int duration) {
if (getState() != STATE_ON) return false;
try { try {
return mService.setScanMode(mode, duration); return mService.setScanMode(mode, duration);
} catch (RemoteException e) {Log.e(TAG, "", e);} } catch (RemoteException e) {Log.e(TAG, "", e);}
@ -532,11 +535,13 @@ public final class BluetoothAdapter {
/** @hide */ /** @hide */
public boolean setScanMode(int mode) { public boolean setScanMode(int mode) {
if (getState() != STATE_ON) return false;
return setScanMode(mode, 120); return setScanMode(mode, 120);
} }
/** @hide */ /** @hide */
public int getDiscoverableTimeout() { public int getDiscoverableTimeout() {
if (getState() != STATE_ON) return -1;
try { try {
return mService.getDiscoverableTimeout(); return mService.getDiscoverableTimeout();
} catch (RemoteException e) {Log.e(TAG, "", e);} } catch (RemoteException e) {Log.e(TAG, "", e);}
@ -545,6 +550,7 @@ public final class BluetoothAdapter {
/** @hide */ /** @hide */
public void setDiscoverableTimeout(int timeout) { public void setDiscoverableTimeout(int timeout) {
if (getState() != STATE_ON) return;
try { try {
mService.setDiscoverableTimeout(timeout); mService.setDiscoverableTimeout(timeout);
} catch (RemoteException e) {Log.e(TAG, "", e);} } catch (RemoteException e) {Log.e(TAG, "", e);}
@ -577,6 +583,7 @@ public final class BluetoothAdapter {
* @return true on success, false on error * @return true on success, false on error
*/ */
public boolean startDiscovery() { public boolean startDiscovery() {
if (getState() != STATE_ON) return false;
try { try {
return mService.startDiscovery(); return mService.startDiscovery();
} catch (RemoteException e) {Log.e(TAG, "", e);} } catch (RemoteException e) {Log.e(TAG, "", e);}
@ -597,6 +604,7 @@ public final class BluetoothAdapter {
* @return true on success, false on error * @return true on success, false on error
*/ */
public boolean cancelDiscovery() { public boolean cancelDiscovery() {
if (getState() != STATE_ON) return false;
try { try {
mService.cancelDiscovery(); mService.cancelDiscovery();
} catch (RemoteException e) {Log.e(TAG, "", e);} } catch (RemoteException e) {Log.e(TAG, "", e);}
@ -619,6 +627,7 @@ public final class BluetoothAdapter {
* @return true if discovering * @return true if discovering
*/ */
public boolean isDiscovering() { public boolean isDiscovering() {
if (getState() != STATE_ON) return false;
try { try {
return mService.isDiscovering(); return mService.isDiscovering();
} catch (RemoteException e) {Log.e(TAG, "", e);} } catch (RemoteException e) {Log.e(TAG, "", e);}
@ -633,6 +642,7 @@ public final class BluetoothAdapter {
* @return unmodifiable set of {@link BluetoothDevice}, or null on error * @return unmodifiable set of {@link BluetoothDevice}, or null on error
*/ */
public Set<BluetoothDevice> getBondedDevices() { public Set<BluetoothDevice> getBondedDevices() {
if (getState() != STATE_ON) return null;
try { try {
return toDeviceSet(mService.listBonds()); return toDeviceSet(mService.listBonds());
} catch (RemoteException e) {Log.e(TAG, "", e);} } catch (RemoteException e) {Log.e(TAG, "", e);}