diff options
| -rw-r--r-- | src/com/android/bluetooth/btservice/AdapterService.java | 2 | ||||
| -rw-r--r-- | src/com/android/bluetooth/btservice/BondStateMachine.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java index 069139b56..ac43b9b65 100644 --- a/src/com/android/bluetooth/btservice/AdapterService.java +++ b/src/com/android/bluetooth/btservice/AdapterService.java @@ -1919,6 +1919,7 @@ public class AdapterService extends Service { service, attributionSource, "AdapterService setScanMode")) { return false; } + enforceBluetoothPrivilegedPermission(service); service.mAdapterProperties.setDiscoverableTimeout(duration); return service.mAdapterProperties.setScanMode(convertScanModeToHal(mode)); @@ -1943,6 +1944,7 @@ public class AdapterService extends Service { service, attributionSource, "AdapterService setDiscoverableTimeout")) { return false; } + enforceBluetoothPrivilegedPermission(service); return service.mAdapterProperties.setDiscoverableTimeout(timeout); } diff --git a/src/com/android/bluetooth/btservice/BondStateMachine.java b/src/com/android/bluetooth/btservice/BondStateMachine.java index 927040222..f10d32571 100644 --- a/src/com/android/bluetooth/btservice/BondStateMachine.java +++ b/src/com/android/bluetooth/btservice/BondStateMachine.java @@ -563,7 +563,8 @@ final class BondStateMachine extends StateMachine { } } - if (newState == BluetoothDevice.BOND_BONDED ) { + if ((newState == BluetoothDevice.BOND_BONDED ) + ||(newState == BluetoothDevice.BOND_NONE)){ mAdapterProperties.updateSdpProgress(device, true /* SDP Completed */); } Intent intent = new Intent(BluetoothDevice.ACTION_BOND_STATE_CHANGED); |