OSDN Git Service

Bluetooth: prevent enabling BLE in airplane mode
authorMarie Janssen <jamuraa@google.com>
Tue, 25 Oct 2016 17:47:51 +0000 (10:47 -0700)
committerMarie Janssen <jamuraa@google.com>
Wed, 26 Oct 2016 21:55:47 +0000 (14:55 -0700)
commita80d745c656f1e09aa9331002f613883220ca029
tree08daed78f10b85765571338f4327fc77444ff23d
parente9db00e39fb58db2380ec3f9fba11f006a4b4185
Bluetooth: prevent enabling BLE in airplane mode

Enabling BLE in airplane mode puts BluetoothManagerService in an
unexpected state which causes Bluetooth to be on when airplane mode
is disabled.

Also fixes a bug where a crash of a BLE client would trigger a restart
into ON mode.

Test: SL4A BleBackgroundScanTest:test_airplane_mode_disables_ble

Bug: 32140251
Bug: 32140271
Bug: 32369494

Change-Id: Ie65157e65c3a1ca914f567a7a0c631175d1e5835
(cherry picked from commit bd93b7b3dc6141cef6236cf0ca7dcc5acf5bfeed)
core/java/android/bluetooth/BluetoothAdapter.java
services/core/java/com/android/server/BluetoothManagerService.java