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

Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev

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

4
res/xml/location_scanning.xml
View File

@@ -17,13 +17,13 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/location_scanning_screen_title"> android:title="@string/location_scanning_screen_title">
<SwitchPreference <com.android.settingslib.RestrictedSwitchPreference
android:title="@string/location_scanning_wifi_always_scanning_title" android:title="@string/location_scanning_wifi_always_scanning_title"
android:summary="@string/location_scanning_wifi_always_scanning_description" android:summary="@string/location_scanning_wifi_always_scanning_description"
android:defaultValue="true" android:defaultValue="true"
android:key="wifi_always_scanning" /> android:key="wifi_always_scanning" />
<SwitchPreference <com.android.settingslib.RestrictedSwitchPreference
android:title="@string/location_scanning_bluetooth_always_scanning_title" android:title="@string/location_scanning_bluetooth_always_scanning_title"
android:summary="@string/location_scanning_bluetooth_always_scanning_description" android:summary="@string/location_scanning_bluetooth_always_scanning_description"
android:defaultValue="true" android:defaultValue="true"

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

@@ -14,12 +14,17 @@
package com.android.settings.location; package com.android.settings.location;
import android.content.Context; import android.content.Context;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings; import android.provider.Settings;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.SwitchPreference; import androidx.preference.SwitchPreference;
import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
public class BluetoothScanningPreferenceController extends AbstractPreferenceController public class BluetoothScanningPreferenceController extends AbstractPreferenceController
@@ -46,6 +51,12 @@ public class BluetoothScanningPreferenceController extends AbstractPreferenceCon
((SwitchPreference) preference).setChecked( ((SwitchPreference) preference).setChecked(
Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0) == 1); Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0) == 1);
final RestrictedLockUtils.EnforcedAdmin admin =
RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
mContext, UserManager.DISALLOW_CONFIG_LOCATION, UserHandle.myUserId());
if (admin != null) {
((RestrictedSwitchPreference) preference).setDisabledByAdmin(admin);
}
} }
@Override @Override

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

@@ -14,12 +14,17 @@
package com.android.settings.location; package com.android.settings.location;
import android.content.Context; import android.content.Context;
import android.os.UserHandle;
import android.os.UserManager;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.SwitchPreference; import androidx.preference.SwitchPreference;
import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
public class WifiScanningPreferenceController extends AbstractPreferenceController public class WifiScanningPreferenceController extends AbstractPreferenceController
@@ -46,6 +51,12 @@ public class WifiScanningPreferenceController extends AbstractPreferenceControll
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
((SwitchPreference) preference).setChecked(mWifiManager.isScanAlwaysAvailable()); ((SwitchPreference) preference).setChecked(mWifiManager.isScanAlwaysAvailable());
final RestrictedLockUtils.EnforcedAdmin admin =
RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
mContext, UserManager.DISALLOW_CONFIG_LOCATION, UserHandle.myUserId());
if (admin != null) {
((RestrictedSwitchPreference) preference).setDisabledByAdmin(admin);
}
} }
@Override @Override