commit e86e47178e39040e2eda13390c9370dc03525824
author Roshan Pius <rpius@google.com> Fri Aug 25 19:06:15 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 25 19:06:15 2023 +0000
tree 9a910d40710457ab56a0c85a3eee2b9013b54e14
parent e75ae19e0fe85e0a7d3c7a2002b6eb8be80a0963
parent a3f6a70e9b9594e1a622118db40b653a644f52d8

Merge "Implement DISALLOW_NFC AE user restriction" into main am: a3f6a70e9b

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2716375

Change-Id: I0cd0d4bea29c9e82f75b266e6a9daf0b617b3f97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java b/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java
index 78e3184..b491ec9 100644
--- a/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java
+++ b/src/com/android/settings/location/BluetoothScanningMainSwitchPreferenceController.java
@@ -18,7 +18,6 @@
 import android.content.Context;
 import android.provider.Settings;
 import android.widget.Switch;
-import android.os.UserManager;
 
 import androidx.preference.PreferenceScreen;
 
@@ -34,11 +33,9 @@
         implements OnMainSwitchChangeListener {
 
     private static final String KEY_BLUETOOTH_SCANNING_SWITCH = "bluetooth_always_scanning_switch";
-    private final UserManager mUserManager;
 
     public BluetoothScanningMainSwitchPreferenceController(Context context) {
         super(context, KEY_BLUETOOTH_SCANNING_SWITCH);
-        mUserManager = UserManager.get(context);
     }
 
     @Override
@@ -52,9 +49,7 @@
     @Override
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_location_scanning)
-                ? (mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_LOCATION)
-                        ? DISABLED_DEPENDENT_SETTING
-                        : AVAILABLE)
+                ? AVAILABLE
                 : UNSUPPORTED_ON_DEVICE;
     }
 

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

diff --git a/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java b/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java
index e22b0a0..546f1e1 100644
--- a/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java
+++ b/src/com/android/settings/location/WifiScanningMainSwitchPreferenceController.java
@@ -18,7 +18,6 @@
 import android.content.Context;
 import android.net.wifi.WifiManager;
 import android.widget.Switch;
-import android.os.UserManager;
 
 import androidx.preference.PreferenceScreen;
 
@@ -35,12 +34,10 @@
 
     private static final String KEY_WIFI_SCANNING_SWITCH = "wifi_always_scanning_switch";
     private final WifiManager mWifiManager;
-    private final UserManager mUserManager;
 
     public WifiScanningMainSwitchPreferenceController(Context context) {
         super(context, KEY_WIFI_SCANNING_SWITCH);
         mWifiManager = context.getSystemService(WifiManager.class);
-        mUserManager = UserManager.get(context);
     }
 
     @Override
@@ -55,9 +52,7 @@
     @Override
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_location_scanning)
-                ? (mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_LOCATION)
-                       ? DISABLED_DEPENDENT_SETTING
-                       : AVAILABLE)
+                ? AVAILABLE
                 : UNSUPPORTED_ON_DEVICE;
     }