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

Merge "Fix NPE when accessing mCallback in BluetoothGatt" am: 1be8fb23eb am: 28f182aa87

Browse Source 
am: 3657c398e1

Change-Id: I9425efce8de6376c0e3c74401d74da39e8037b98
This commit is contained in:
Jakub Pawlowski
2017-04-27 21:24:35 +00:00
committed by android-build-merger
parent c2f309cd39 3657c398e1
commit 7918ff08dd
1 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,8 +159,10 @@ public final class BluetoothGatt implements BluetoothProfile {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
mCallback.onConnectionStateChange(BluetoothGatt.this, GATT_FAILURE, if (mCallback != null) {
BluetoothProfile.STATE_DISCONNECTED); mCallback.onConnectionStateChange(BluetoothGatt.this, GATT_FAILURE,
BluetoothProfile.STATE_DISCONNECTED);
}
} }
}); });
@@ -192,7 +194,9 @@ public final class BluetoothGatt implements BluetoothProfile {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
mCallback.onPhyUpdate(BluetoothGatt.this, txPhy, rxPhy, status); if (mCallback != null) {
mCallback.onPhyUpdate(BluetoothGatt.this, txPhy, rxPhy, status);
}
} }
}); });
} }
@@ -212,7 +216,9 @@ public final class BluetoothGatt implements BluetoothProfile {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
mCallback.onPhyRead(BluetoothGatt.this, txPhy, rxPhy, status); if (mCallback != null) {
mCallback.onPhyRead(BluetoothGatt.this, txPhy, rxPhy, status);
}
} }
}); });
} }
@@ -235,7 +241,10 @@ public final class BluetoothGatt implements BluetoothProfile {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
mCallback.onConnectionStateChange(BluetoothGatt.this, status, profileState); if (mCallback != null) {
mCallback.onConnectionStateChange(BluetoothGatt.this, status,
profileState);
}
} }
}); });
@@ -294,7 +303,9 @@ public final class BluetoothGatt implements BluetoothProfile {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
mCallback.onServicesDiscovered(BluetoothGatt.this, status); if (mCallback != null) {
mCallback.onServicesDiscovered(BluetoothGatt.this, status);
}
} }
}); });
} }
@@ -344,7 +355,10 @@ public final class BluetoothGatt implements BluetoothProfile {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
mCallback.onCharacteristicRead(BluetoothGatt.this, characteristic, status); if (mCallback != null) {
mCallback.onCharacteristicRead(BluetoothGatt.this, characteristic,
status);
}
} }
}); });
} }
@@ -390,7 +404,10 @@ public final class BluetoothGatt implements BluetoothProfile {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
mCallback.onCharacteristicWrite(BluetoothGatt.this, characteristic, status); if (mCallback != null) {
mCallback.onCharacteristicWrite(BluetoothGatt.this, characteristic,
status);
}
} }
}); });
} }
@@ -416,7 +433,9 @@ public final class BluetoothGatt implements BluetoothProfile {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
mCallback.onCharacteristicChanged(BluetoothGatt.this, characteristic); if (mCallback != null) {
mCallback.onCharacteristicChanged(BluetoothGatt.this, characteristic);
}
} }
}); });
} }
@@ -461,7 +480,9 @@ public final class BluetoothGatt implements BluetoothProfile {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
mCallback.onDescriptorRead(BluetoothGatt.this, descriptor, status); if (mCallback != null) {
mCallback.onDescriptorRead(BluetoothGatt.this, descriptor, status);
}
} }
}); });
} }
@@ -505,7 +526,9 @@ public final class BluetoothGatt implements BluetoothProfile {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
mCallback.onDescriptorWrite(BluetoothGatt.this, descriptor, status); if (mCallback != null) {
mCallback.onDescriptorWrite(BluetoothGatt.this, descriptor, status);
}
} }
}); });
} }
@@ -529,7 +552,9 @@ public final class BluetoothGatt implements BluetoothProfile {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
mCallback.onReliableWriteCompleted(BluetoothGatt.this, status); if (mCallback != null) {
mCallback.onReliableWriteCompleted(BluetoothGatt.this, status);
}
} }
}); });
} }
@@ -548,7 +573,9 @@ public final class BluetoothGatt implements BluetoothProfile {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
mCallback.onReadRemoteRssi(BluetoothGatt.this, rssi, status); if (mCallback != null) {
mCallback.onReadRemoteRssi(BluetoothGatt.this, rssi, status);
}
} }
}); });
} }
@@ -568,7 +595,9 @@ public final class BluetoothGatt implements BluetoothProfile {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
mCallback.onMtuChanged(BluetoothGatt.this, mtu, status); if (mCallback != null) {
mCallback.onMtuChanged(BluetoothGatt.this, mtu, status);
}
} }
}); });
} }
@@ -590,8 +619,10 @@ public final class BluetoothGatt implements BluetoothProfile {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
mCallback.onConnectionUpdated(BluetoothGatt.this, interval, latency, if (mCallback != null) {
timeout, status); mCallback.onConnectionUpdated(BluetoothGatt.this, interval, latency,
timeout, status);
}
} }
}); });
} }