Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9 am: 86c609fc27

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858

Change-Id: I8f27d54b9b621968ad7e09916a42d028473cb68f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

res/xml/location_services.xml

@@ -23,13 +23,13 @@
             android:layout="@layout/preference_category_no_label"
             settings:controller="com.android.settings.location.LocationInjectedServicesPreferenceController"/>
 
-        <Preference
+        <com.android.settingslib.RestrictedPreference
             android:fragment="com.android.settings.location.WifiScanningFragment"
             android:key="location_services_wifi_scanning"
             android:title="@string/location_scanning_wifi_always_scanning_title"
             settings:controller="com.android.settings.location.LocationServicesWifiScanningPreferenceController"/>
 
-        <Preference
+        <com.android.settingslib.RestrictedPreference
             android:fragment="com.android.settings.location.BluetoothScanningFragment"
             android:key="location_services_bluetooth_scanning"
             android:title="@string/location_scanning_bluetooth_always_scanning_title"

src/com/android/settings/location/LocationServicesBluetoothScanningPreferenceController.java

@@ -16,10 +16,14 @@
 package com.android.settings.location;
 
 import android.content.Context;
+import android.os.UserManager;
 import android.provider.Settings;
 
+import androidx.preference.Preference;
+
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.RestrictedPreference;
 
 /**
  * Preference controller for Bluetooth scanning in Location Services.
@@ -31,6 +35,13 @@ public class LocationServicesBluetoothScanningPreferenceController extends
         super(context, key);
     }
 
+    @Override
+    public void updateState(Preference preference) {
+        ((RestrictedPreference) preference).checkRestrictionAndSetDisabled(
+                UserManager.DISALLOW_CONFIG_LOCATION);
+        refreshSummary(preference);
+    }
+
     @Override
     public CharSequence getSummary() {
         final boolean bleScanOn = Settings.Global.getInt(mContext.getContentResolver(),

src/com/android/settings/location/LocationServicesWifiScanningPreferenceController.java

@@ -17,9 +17,13 @@ package com.android.settings.location;
 
 import android.content.Context;
 import android.net.wifi.WifiManager;
+import android.os.UserManager;
+
+import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.RestrictedPreference;
 
 /**
  * Preference controller for Wi-Fi scanning in Location Services.
@@ -33,6 +37,13 @@ public class LocationServicesWifiScanningPreferenceController extends BasePrefer
         mWifiManager = context.getSystemService(WifiManager.class);
     }
 
+    @Override
+    public void updateState(Preference preference) {
+        ((RestrictedPreference) preference).checkRestrictionAndSetDisabled(
+                UserManager.DISALLOW_CONFIG_LOCATION);
+        refreshSummary(preference);
+    }
+
     @Override
     public CharSequence getSummary() {
         final boolean wifiScanOn = mWifiManager.isScanAlwaysAvailable();