summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2022-04-07 04:38:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-04-07 04:38:08 +0000
commitdb3923e3e892985510be51de9420e37f6842dad8 (patch)
treeea71d9b3156eaaebb4f71f5a59f767305b1fba4a
parent95cbb22647ef5e4505f64d97b7dcbfad2a9fb0e0 (diff)
parent528ea846133dc7dc4ce843e5b649abd50b58d527 (diff)
downloadBluetooth-db3923e3e892985510be51de9420e37f6842dad8.tar.gz
Merge "Removes app access to BluetoothAdapter#setDiscoverableTimeout by requiring BLUETOOTH_PRIVILEGED permission." into qt-dev
-rw-r--r--src/com/android/bluetooth/btservice/AdapterService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java
index ed00f8110..8bff73bae 100644
--- a/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/src/com/android/bluetooth/btservice/AdapterService.java
@@ -1919,7 +1919,8 @@ public class AdapterService extends Service {
}
boolean setDiscoverableTimeout(int timeout) {
- enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");
+ enforceCallingOrSelfPermission(
+ BLUETOOTH_PRIVILEGED, "Need BLUETOOTH PRIVILEGED permission");
return mAdapterProperties.setDiscoverableTimeout(timeout);
}