device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java - Issue 2702163002: bluetooth: Close and null out BluetoothGatt on the UI Thread

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java

Issue 2702163002: bluetooth: Close and null out BluetoothGatt on the UI Thread (Closed)

Patch Set: Created 3 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « no previous file | device/bluetooth/bluetooth_remote_gatt_characteristic_unittest.cc » ('j') | device/bluetooth/bluetooth_remote_gatt_characteristic_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java

diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java

index 5ef691323b78b9b97b3d95102d4951adb5d92fab..ee60580c4d72dbfcd1a66c99d9a08d26c85c7469 100644

--- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java

+++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java

@@ -126,26 +126,27 @@ final class ChromeBluetoothDevice {

(newState == android.bluetooth.BluetoothProfile.STATE_CONNECTED)

? "Connected"

: "Disconnected");

- if (newState == android.bluetooth.BluetoothProfile.STATE_CONNECTED) {

- RecordHistogram.recordSparseSlowlyHistogram(

- "Bluetooth.Web.Android.onConnectionStateChange.Status.Connected", status);

- mBluetoothGatt.discoverServices();

- } else if (newState == android.bluetooth.BluetoothProfile.STATE_DISCONNECTED) {

- RecordHistogram.recordSparseSlowlyHistogram(

- "Bluetooth.Web.Android.onConnectionStateChange.Status.Disconnected",

- status);

- if (mBluetoothGatt != null) {

- mBluetoothGatt.close();

- mBluetoothGatt = null;

- }

- } else {

- RecordHistogram.recordSparseSlowlyHistogram(

- "Bluetooth.Web.Android.onConnectionStateChange.Status.InvalidState",

- status);

- }

Wrappers.ThreadUtilsWrapper.getInstance().runOnUiThread(new Runnable() {

@Override

public void run() {

+ if (newState == android.bluetooth.BluetoothProfile.STATE_CONNECTED) {

+ RecordHistogram.recordSparseSlowlyHistogram(

+ "Bluetooth.Web.Android.onConnectionStateChange.Status.Connected",

+ status);

+ mBluetoothGatt.discoverServices();

+ } else if (newState == android.bluetooth.BluetoothProfile.STATE_DISCONNECTED) {

+ RecordHistogram.recordSparseSlowlyHistogram(

+ "Bluetooth.Web.Android.onConnectionStateChange.Status.Disconnected",

+ status);

+ if (mBluetoothGatt != null) {

+ mBluetoothGatt.close();

+ mBluetoothGatt = null;

+ }

+ } else {

+ RecordHistogram.recordSparseSlowlyHistogram(

+ "Bluetooth.Web.Android.onConnectionStateChange.Status.InvalidState",

+ status);

+ }

if (mNativeBluetoothDeviceAndroid != 0) {

nativeOnConnectionStateChange(mNativeBluetoothDeviceAndroid, status,

newState == android.bluetooth.BluetoothProfile.STATE_CONNECTED);