Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d765af04 authored by Lin Yuan's avatar Lin Yuan Committed by Android (Google) Code Review
Browse files

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

parents 2f184b0f 9eff8f7a

res/xml/location_scanning.xml

+2 −2
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ 
        android:title="@string/location_scanning_screen_title"

        android:key="scanning_screen">



        <SwitchPreference

        <com.android.settingslib.RestrictedSwitchPreference

            android:title="@string/location_scanning_wifi_always_scanning_title"

            android:summary="@string/location_scanning_wifi_always_scanning_description"

            android:defaultValue="true"

            android:key="wifi_always_scanning" />



        <SwitchPreference

        <com.android.settingslib.RestrictedSwitchPreference

            android:title="@string/location_scanning_bluetooth_always_scanning_title"

            android:summary="@string/location_scanning_bluetooth_always_scanning_description"

            android:defaultValue="true"

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

+11 −0
Original line number Diff line number Diff line
@@ -14,12 +14,17 @@ 
package com.android.settings.location;



import android.content.Context;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings;



import androidx.preference.Preference;

import androidx.preference.SwitchPreference;



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;



public class BluetoothScanningPreferenceController extends AbstractPreferenceController
@@ -46,6 +51,12 @@ public class BluetoothScanningPreferenceController extends AbstractPreferenceCon 
        ((SwitchPreference) preference).setChecked(

                Settings.Global.getInt(mContext.getContentResolver(),

                        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

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

+11 −0
Original line number Diff line number Diff line
@@ -14,12 +14,17 @@ 
package com.android.settings.location;



import android.content.Context;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings;



import androidx.preference.Preference;

import androidx.preference.SwitchPreference;



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;



public class WifiScanningPreferenceController extends AbstractPreferenceController
@@ -46,6 +51,12 @@ public class WifiScanningPreferenceController extends AbstractPreferenceControll 
        ((SwitchPreference) preference).setChecked(

                Settings.Global.getInt(mContext.getContentResolver(),

                        Settings.Global.WIFI_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