mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
082bc48c32
https://review.lineageos.org/q/topic:P_asb_2022-05 https://review.lineageos.org/q/topic:P_asb_2022-06 https://review.lineageos.org/q/topic:P_asb_2022-07 https://review.lineageos.org/q/topic:P_asb_2022-08 https://review.lineageos.org/q/topic:P_asb_2022-09 https://review.lineageos.org/q/topic:P_asb_2022-10 https://review.lineageos.org/q/topic:P_asb_2022-11 https://review.lineageos.org/q/topic:P_asb_2022-12 https://review.lineageos.org/q/topic:P_asb_2023-01 https://review.lineageos.org/q/topic:P_asb_2023-02 https://review.lineageos.org/q/topic:P_asb_2023-03 https://review.lineageos.org/q/topic:P_asb_2023-04 https://review.lineageos.org/q/topic:P_asb_2023-05 https://review.lineageos.org/q/topic:P_asb_2023-06 https://review.lineageos.org/q/topic:P_asb_2023-07 accounted for via manifest change: https://review.lineageos.org/c/LineageOS/android_external_freetype/+/361250 https://review.lineageos.org/q/topic:P_asb_2023-08 accounted for via manifest change: https://review.lineageos.org/c/LineageOS/android_external_freetype/+/364606 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/365328 https://review.lineageos.org/q/topic:P_asb_2023-09 https://review.lineageos.org/q/topic:P_asb_2023-10 https://review.lineageos.org/q/topic:P_asb_2023-11 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/374916 https://review.lineageos.org/q/topic:P_asb_2023-12 https://review.lineageos.org/q/topic:P_asb_2024-01 https://review.lineageos.org/q/topic:P_asb_2024-02 https://review.lineageos.org/q/topic:P_asb_2024-03 https://review.lineageos.org/q/topic:P_asb_2024-04 Signed-off-by: Tavi <tavi@divested.dev>
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Rahul Sabnis <rahulsabnis@google.com>
|
|
Date: Wed, 6 Apr 2022 22:44:01 +0000
|
|
Subject: [PATCH] Removes app access to BluetoothAdapter#setDiscoverableTimeout
|
|
by requiring BLUETOOTH_PRIVILEGED permission.
|
|
|
|
Bug: 206807679
|
|
Test: Manual
|
|
Merged-In: I73288f495d35280a5724d070248db54e2fe537fd
|
|
Change-Id: I73288f495d35280a5724d070248db54e2fe537fd
|
|
(cherry picked from commit 528ea846133dc7dc4ce843e5b649abd50b58d527)
|
|
Merged-In: I73288f495d35280a5724d070248db54e2fe537fd
|
|
---
|
|
src/com/android/bluetooth/btservice/AdapterService.java | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java
|
|
index 3b804db7a..a14f8d657 100644
|
|
--- a/src/com/android/bluetooth/btservice/AdapterService.java
|
|
+++ b/src/com/android/bluetooth/btservice/AdapterService.java
|
|
@@ -1717,7 +1717,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);
|
|
}
|