From a12fff673b59d7674b2ba04f30e92a9941fff7ac Mon Sep 17 00:00:00 2001 From: Lin Yuan Date: Thu, 26 May 2022 18:49:21 -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: http://shortn/_EUOdqrOcnS, http://shortn/_j320QDm1Zo Bug: 228315522 Bug: 228315529 Test: atest SettingsRoboTests, on device Change-Id: I78291579a79e915a27ebdd051b3caf3fc04efc41 (cherry picked from commit fcae147f58be3b6441ce9e03bc59515af0d53ccc) --- res/xml/location_services.xml | 4 ++-- ...ServicesBluetoothScanningPreferenceController.java | 11 +++++++++++ ...ationServicesWifiScanningPreferenceController.java | 11 +++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/res/xml/location_services.xml b/res/xml/location_services.xml index 2de4e7b2446..04eff2343a3 100644 --- a/res/xml/location_services.xml +++ b/res/xml/location_services.xml @@ -23,13 +23,13 @@ android:layout="@layout/preference_category_no_label" settings:controller="com.android.settings.location.LocationInjectedServicesPreferenceController"/> - -