From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Lin Yuan Date: Tue, 31 May 2022 19:13:41 -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/49nR5HQ8g5bgNVq Bug: 228315522 Bug: 228315529 Test: on device Change-Id: I92b22567011c32f0874bcecb3898ef678bb549a1 (cherry picked from commit 9eff8f7a8d5140a4b674fa09cf333dce07fde76c) Merged-In: I92b22567011c32f0874bcecb3898ef678bb549a1 --- res/xml/location_scanning.xml | 4 ++-- .../BluetoothScanningPreferenceController.java | 10 ++++++++++ .../location/WifiScanningPreferenceController.java | 10 ++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/res/xml/location_scanning.xml b/res/xml/location_scanning.xml index 5e7bd244520..f4847681150 100644 --- a/res/xml/location_scanning.xml +++ b/res/xml/location_scanning.xml @@ -18,13 +18,13 @@ android:title="@string/location_scanning_screen_title" android:key="scanning_screen"> - -