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 am: c548cdc4a9

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23753764

Change-Id: I8eb18e0f788a9a26da01222abd17149c350fc4ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-06-21 05:02:26 +00:00
committed by Automerger Merge Worker
parent de5c8613ba c548cdc4a9
commit d6ae6f8655
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);
}