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

Merge "BluetoothManagerService: continue teardown when BLE apps registered"

Browse Source 
am: ba0992f4c4

Change-Id: Iac58de264ca48184d2ddd0cf4aeb9a3d5719539c
This commit is contained in:
Andre Eisenbach
2017-03-07 00:37:31 +00:00
committed by android-build-merger
parent 25684ceff5 ba0992f4c4
commit 9b3d4cb3a7
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/BluetoothManagerService.java
View File

@@ -641,6 +641,9 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
if (appCount == 0 && mEnable) {
disableBleScanMode();
}
if (appCount == 0 && !mEnableExternal) {
sendBrEdrDownCallback();
}
return appCount;
}
@@ -696,7 +699,14 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
return;
}
if (isBleAppPresent() == false) {
if (isBleAppPresent()) {
// Need to stay at BLE ON. Disconnect all Gatt connections
try {
mBluetoothGatt.unregAll();
} catch (RemoteException e) {
Slog.e(TAG, "Unable to disconnect all apps.", e);
}
} else {
try {
mBluetoothLock.readLock().lock();
if (mBluetooth != null) mBluetooth.onBrEdrDown();
@@ -705,14 +715,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
} finally {
mBluetoothLock.readLock().unlock();
}
} else {
// Need to stay at BLE ON. Disconnect all Gatt connections
try {
mBluetoothGatt.unregAll();
} catch (RemoteException e) {
Slog.e(TAG, "Unable to disconnect all apps.", e);
}
}
}
public boolean enableNoAutoConnect(String packageName)