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

Merge "Bluetooth: prevent enabling BLE in airplane mode"

Browse Source
This commit is contained in:
Treehugger Robot
2016-10-31 17:20:39 +00:00
committed by Gerrit Code Review
parent 78a63c1cf0 6a383a7d32
commit 6a31a5c2dd
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/bluetooth/BluetoothAdapter.java
View File

@@ -786,19 +786,13 @@ public final class BluetoothAdapter {
public boolean enableBLE() { public boolean enableBLE() {
if (!isBleScanAlwaysAvailable()) return false; if (!isBleScanAlwaysAvailable()) return false;
if (isLeEnabled() == true) {
if (DBG) Log.d(TAG, "enableBLE(): BT is already enabled..!");
try { try {
mManagerService.updateBleAppCount(mToken, true); mManagerService.updateBleAppCount(mToken, true);
} catch (RemoteException e) { if (isLeEnabled()) {
Log.e(TAG, "", e); if (DBG) Log.d(TAG, "enableBLE(): Bluetooth already enabled");
}
return true; return true;
} }
if (DBG) Log.d(TAG, "enableBLE(): Calling enable");
try {
if (DBG) Log.d(TAG, "Calling enableBLE");
mManagerService.updateBleAppCount(mToken, true);
return mManagerService.enable(ActivityThread.currentPackageName()); return mManagerService.enable(ActivityThread.currentPackageName());
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "", e); Log.e(TAG, "", e);

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

@@ -221,6 +221,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
mBluetoothLock.readLock().lock(); mBluetoothLock.readLock().lock();
if (mBluetooth != null) { if (mBluetooth != null) {
mBluetooth.onBrEdrDown(); mBluetooth.onBrEdrDown();
mEnable = false;
mEnableExternal = false; mEnableExternal = false;
} }
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -443,7 +444,9 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
if (DBG) Slog.d(TAG, "Disabling LE only mode after application crash"); if (DBG) Slog.d(TAG, "Disabling LE only mode after application crash");
try { try {
mBluetoothLock.readLock().lock(); mBluetoothLock.readLock().lock();
if (mBluetooth != null) { if (mBluetooth != null &&
mBluetooth.getState() == BluetoothAdapter.STATE_BLE_ON) {
mEnable = false;
mBluetooth.onBrEdrDown(); mBluetooth.onBrEdrDown();
} }
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -460,6 +463,9 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
@Override @Override
public boolean isBleScanAlwaysAvailable() { public boolean isBleScanAlwaysAvailable() {
if (isAirplaneModeOn() && !mEnable) {
return false;
}
try { try {
return (Settings.Global.getInt(mContentResolver, return (Settings.Global.getInt(mContentResolver,
Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE)) != 0; Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE)) != 0;