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 fcae147f58
)
This commit is contained in:
@@ -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();
|
||||
|
Reference in New Issue
Block a user