From a15126efd6cc1ba7d30d9744b51fcde048876db0 Mon Sep 17 00:00:00 2001
From: Rahul Sabnis <rahulsabnis@google.com>
Date: Wed, 6 Apr 2022 22:44:01 +0000
Subject: Removes app access to BluetoothAdapter#setDiscoverableTimeout by
 requiring BLUETOOTH_PRIVILEGED permission.

Bug: 206807679
Test: Manual

CRs-Fixed: 3210755
Change-Id: I73288f495d35280a5724d070248db54e2fe537fd
(cherry picked from commit cc22abc0643c66e5873cbd0d15cd128816a186cf)
Merged-In: I73288f495d35280a5724d070248db54e2fe537fd
---
 src/com/android/bluetooth/btservice/AdapterService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java
index 451f4f415..ac43b9b65 100644
--- a/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/src/com/android/bluetooth/btservice/AdapterService.java
@@ -1944,6 +1944,7 @@ public class AdapterService extends Service {
                             service, attributionSource, "AdapterService setDiscoverableTimeout")) {
                 return false;
             }
+            enforceBluetoothPrivilegedPermission(service);
             return service.mAdapterProperties.setDiscoverableTimeout(timeout);
         }
 
-- 
cgit v1.2.3