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

Commit 97c15312 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 sc-dev

parents 2e68c87a 2598a722

res/xml/location_services.xml

+2 −2
Original line number Diff line number Diff line
@@ -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

+11 −0
Original line number Diff line number Diff line
@@ -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

+11 −0
Original line number Diff line number Diff line
@@ -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();