PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix: policy enforcement for location wifi scanning" into tm-dev

Browse Source
This commit is contained in:
Lin Yuan
2022-06-02 19:59:07 +00:00
committed by Android (Google) Code Review
parent 1ef5a1c86a c877dce583
commit 6ffe64a0a9
3 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/location/LocationServicesBluetoothScanningPreferenceController.java
View File

@@ -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(),

11
src/com/android/settings/location/LocationServicesWifiScanningPreferenceController.java
View File

@@ -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();