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

Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-06-21 04:25:57 +00:00
committed by Android (Google) Code Review
parent 4d3b967fb8 7bd6646e5f
commit c548cdc4a9
2 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/wifi/tether/WifiTetherSettings.java
View File

@@ -91,7 +91,8 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
@VisibleForTesting
WifiTetherAutoOffPreferenceController mWifiTetherAutoOffPreferenceController;
private boolean mUnavailable;
@VisibleForTesting
boolean mUnavailable;
private WifiRestriction mWifiRestriction;
@VisibleForTesting
TetherChangeReceiver mTetherChangeReceiver;
@@ -139,6 +140,9 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
setIfOnlyAvailableForAdmins(true);
mUnavailable = isUiRestricted() || !mWifiRestriction.isHotspotAvailable(getContext());
if (mUnavailable) {
return;
}
mWifiTetherViewModel = FeatureFactory.getFactory(getContext()).getWifiFeatureProvider()
.getWifiTetherViewModel(this);
@@ -342,7 +346,16 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
@Override
protected boolean isPageSearchEnabled(Context context) {
if (context == null || !WifiUtils.canShowWifiHotspot(context)) return false;
if (context == null) {
return false;
}
UserManager userManager = context.getSystemService(UserManager.class);
if (userManager == null || !userManager.isAdminUser()) {
return false;
}
if (!WifiUtils.canShowWifiHotspot(context)) {
return false;
}
return !FeatureFlagUtils.isEnabled(context, FeatureFlags.TETHER_ALL_IN_ONE);
}