From 78799a550a6ea1bb9596b6b3ab6402ec8a038d6b Mon Sep 17 00:00:00 2001 From: Lin Yuan Date: Wed, 1 Jun 2022 07:17:47 -0400 Subject: [PATCH] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning Make DISALLOW_CONFIG_LOCATION effectively disallow wifi scanning and bluetooth scanning settings for location services. screenshots: https://screenshot.googleplex.com/AqvEW2kTrQT2Ufp Bug: 228315522 Bug: 228315529 Test: manually on sunfish flashed with rvc. Change-Id: I6ef64a34764e52de7b461e87ea0af40a6d050587 --- res/xml/location_scanning.xml | 4 ++-- .../BluetoothScanningPreferenceController.java | 11 +++++++++++ .../location/WifiScanningPreferenceController.java | 11 +++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/res/xml/location_scanning.xml b/res/xml/location_scanning.xml index f82500bf8e9..99aed9a73b4 100644 --- a/res/xml/location_scanning.xml +++ b/res/xml/location_scanning.xml @@ -17,13 +17,13 @@ - -