Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Bluetooth GATT API default handler assignment" am: 612b8bef0c

Browse Source 
am: 0b34d001e4

Change-Id: Ie18a2a483bb08d924a93db4f7dd95c948a6fb323
This commit is contained in:
Ruben Brunk
2017-05-05 23:46:53 +00:00
committed by android-build-merger
parent 5fa4ae0c33 0b34d001e4
commit f4a9d362a8
2 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/bluetooth/BluetoothDevice.java
View File

@@ -1714,7 +1714,7 @@ public final class BluetoothDevice implements Parcelable {
* an d{@link BluetoothDevice#PHY_LE_CODED_MASK}. This option does not take effect * an d{@link BluetoothDevice#PHY_LE_CODED_MASK}. This option does not take effect
* if {@code autoConnect} is set to true. * if {@code autoConnect} is set to true.
* @param handler The handler to use for the callback. If {@code null}, callbacks will happen * @param handler The handler to use for the callback. If {@code null}, callbacks will happen
* on the service's main thread. * on an un-specified background thread.
* @throws NullPointerException if callback is null * @throws NullPointerException if callback is null
*/ */
public BluetoothGatt connectGatt(Context context, boolean autoConnect, public BluetoothGatt connectGatt(Context context, boolean autoConnect,
@@ -1723,9 +1723,6 @@ public final class BluetoothDevice implements Parcelable {
if (callback == null) if (callback == null)
throw new NullPointerException("callback is null"); throw new NullPointerException("callback is null");
if (handler == null)
handler = new Handler(Looper.getMainLooper());
// TODO(Bluetooth) check whether platform support BLE // TODO(Bluetooth) check whether platform support BLE
// Do the check here or in GattServer? // Do the check here or in GattServer?
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();

44
core/java/android/bluetooth/BluetoothGatt.java
View File

@@ -156,7 +156,7 @@ public final class BluetoothGatt implements BluetoothProfile {
} }
mClientIf = clientIf; mClientIf = clientIf;
if (status != GATT_SUCCESS) { if (status != GATT_SUCCESS) {
mHandler.post(new Runnable() { runOrQueueCallback(new Runnable() {
@Override @Override
public void run() { public void run() {
if (mCallback != null) { if (mCallback != null) {
@@ -191,7 +191,7 @@ public final class BluetoothGatt implements BluetoothProfile {
return; return;
} }
mHandler.post(new Runnable() { runOrQueueCallback(new Runnable() {
@Override @Override
public void run() { public void run() {
if (mCallback != null) { if (mCallback != null) {
@@ -213,7 +213,7 @@ public final class BluetoothGatt implements BluetoothProfile {
return; return;
} }
mHandler.post(new Runnable() { runOrQueueCallback(new Runnable() {
@Override @Override
public void run() { public void run() {
if (mCallback != null) { if (mCallback != null) {
@@ -238,7 +238,7 @@ public final class BluetoothGatt implements BluetoothProfile {
int profileState = connected ? BluetoothProfile.STATE_CONNECTED : int profileState = connected ? BluetoothProfile.STATE_CONNECTED :
BluetoothProfile.STATE_DISCONNECTED; BluetoothProfile.STATE_DISCONNECTED;
mHandler.post(new Runnable() { runOrQueueCallback(new Runnable() {
@Override @Override
public void run() { public void run() {
if (mCallback != null) { if (mCallback != null) {
@@ -300,7 +300,7 @@ public final class BluetoothGatt implements BluetoothProfile {
} }
} }
mHandler.post(new Runnable() { runOrQueueCallback(new Runnable() {
@Override @Override
public void run() { public void run() {
if (mCallback != null) { if (mCallback != null) {
@@ -352,7 +352,7 @@ public final class BluetoothGatt implements BluetoothProfile {
if (status == 0) characteristic.setValue(value); if (status == 0) characteristic.setValue(value);
mHandler.post(new Runnable() { runOrQueueCallback(new Runnable() {
@Override @Override
public void run() { public void run() {
if (mCallback != null) { if (mCallback != null) {
@@ -401,7 +401,7 @@ public final class BluetoothGatt implements BluetoothProfile {
mAuthRetryState = AUTH_RETRY_STATE_IDLE; mAuthRetryState = AUTH_RETRY_STATE_IDLE;
mHandler.post(new Runnable() { runOrQueueCallback(new Runnable() {
@Override @Override
public void run() { public void run() {
if (mCallback != null) { if (mCallback != null) {
@@ -430,7 +430,7 @@ public final class BluetoothGatt implements BluetoothProfile {
characteristic.setValue(value); characteristic.setValue(value);
mHandler.post(new Runnable() { runOrQueueCallback(new Runnable() {
@Override @Override
public void run() { public void run() {
if (mCallback != null) { if (mCallback != null) {
@@ -477,7 +477,7 @@ public final class BluetoothGatt implements BluetoothProfile {
mAuthRetryState = AUTH_RETRY_STATE_IDLE; mAuthRetryState = AUTH_RETRY_STATE_IDLE;
mHandler.post(new Runnable() { runOrQueueCallback(new Runnable() {
@Override @Override
public void run() { public void run() {
if (mCallback != null) { if (mCallback != null) {
@@ -523,7 +523,7 @@ public final class BluetoothGatt implements BluetoothProfile {
mAuthRetryState = AUTH_RETRY_STATE_IDLE; mAuthRetryState = AUTH_RETRY_STATE_IDLE;
mHandler.post(new Runnable() { runOrQueueCallback(new Runnable() {
@Override @Override
public void run() { public void run() {
if (mCallback != null) { if (mCallback != null) {
@@ -549,7 +549,7 @@ public final class BluetoothGatt implements BluetoothProfile {
mDeviceBusy = false; mDeviceBusy = false;
} }
mHandler.post(new Runnable() { runOrQueueCallback(new Runnable() {
@Override @Override
public void run() { public void run() {
if (mCallback != null) { if (mCallback != null) {
@@ -570,7 +570,7 @@ public final class BluetoothGatt implements BluetoothProfile {
if (!address.equals(mDevice.getAddress())) { if (!address.equals(mDevice.getAddress())) {
return; return;
} }
mHandler.post(new Runnable() { runOrQueueCallback(new Runnable() {
@Override @Override
public void run() { public void run() {
if (mCallback != null) { if (mCallback != null) {
@@ -592,7 +592,7 @@ public final class BluetoothGatt implements BluetoothProfile {
return; return;
} }
mHandler.post(new Runnable() { runOrQueueCallback(new Runnable() {
@Override @Override
public void run() { public void run() {
if (mCallback != null) { if (mCallback != null) {
@@ -616,7 +616,7 @@ public final class BluetoothGatt implements BluetoothProfile {
return; return;
} }
mHandler.post(new Runnable() { runOrQueueCallback(new Runnable() {
@Override @Override
public void run() { public void run() {
if (mCallback != null) { if (mCallback != null) {
@@ -702,6 +702,22 @@ public final class BluetoothGatt implements BluetoothProfile {
return null; return null;
} }
/**
* Queue the runnable on a {@link Handler} provided by the user, or execute the runnable
* immediately if no Handler was provided.
*/
private void runOrQueueCallback(final Runnable cb) {
if (mHandler == null) {
try {
cb.run();
} catch (Exception ex) {
Log.w(TAG, "Unhandled exception in callback", ex);
}
} else {
mHandler.post(cb);
}
}
/** /**
* Register an application callback to start using GATT. * Register an application callback to start using GATT.
* *