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

Restrict secondary users to share Wi-Fi network

Browse Source 
- Remove "Share" and "Forget" options from the long press menu

- Rollback the Wi-Fi details restriction for admin user only

- Add SafetyNet Logging for security report

Bug: 206986392
Test: manual test
make RunSettingsRoboTests \
  ROBOTEST_FILTER=NetworkProviderSettingsTest
make RunSettingsRoboTests \
  ROBOTEST_FILTER=WifiNetworkDetailsFragmentTest

Change-Id: Ic434f0583cba557228c72508a501347ffa3141e1
This commit is contained in:
Weng Su
2022-03-25 21:39:02 +08:00
parent a12da0a8e8
commit 876f691377
3 changed files with 84 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/com/android/settings/network/NetworkProviderSettings.java
View File

@@ -34,9 +34,11 @@ import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.os.Handler;
import android.os.PowerManager;
import android.os.UserManager;
import android.provider.Settings;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.EventLog;
import android.util.FeatureFlagUtils;
import android.util.Log;
import android.view.ContextMenu;
@@ -204,6 +206,8 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
* by the Test DPC tool in AFW mode.
*/
protected boolean mIsRestricted;
@VisibleForTesting
boolean mIsAdmin = true;
@VisibleForTesting
AirplaneModeEnabler mAirplaneModeEnabler;
@@ -294,6 +298,13 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
addPreferences();
mIsRestricted = isUiRestricted();
mIsAdmin = isAdminUser();
}
private boolean isAdminUser() {
final UserManager userManager = getSystemService(UserManager.class);
if (userManager == null) return true;
return userManager.isAdminUser();
}
private void addPreferences() {
@@ -566,7 +577,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
if (mSelectedWifiEntry.canDisconnect()) {
if (mSelectedWifiEntry.canShare()) {
menu.add(Menu.NONE, MENU_ID_SHARE, 0 /* order */, R.string.share);
addShareMenuIfSuitable(menu);
}
menu.add(Menu.NONE, MENU_ID_DISCONNECT, 1 /* order */,
R.string.wifi_disconnect_button_text);
@@ -575,7 +586,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
// "forget" for normal saved network. And "disconnect" for ephemeral network because it
// could only be disconnected and be put in blocklists so it won't be used again.
if (canForgetNetwork()) {
menu.add(Menu.NONE, MENU_ID_FORGET, 0 /* order */, R.string.forget);
addForgetMenuIfSuitable(menu);
}
WifiConfiguration config = mSelectedWifiEntry.getWifiConfiguration();
@@ -590,6 +601,23 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
}
}
@VisibleForTesting
void addShareMenuIfSuitable(ContextMenu menu) {
if (mIsAdmin) {
menu.add(Menu.NONE, MENU_ID_SHARE, 0 /* order */, R.string.share);
return;
}
Log.w(TAG, "Don't add the Wi-Fi share menu because the user is not an admin.");
EventLog.writeEvent(0x534e4554, "206986392", -1 /* UID */, "User is not an admin");
}
@VisibleForTesting
void addForgetMenuIfSuitable(ContextMenu menu) {
if (mIsAdmin) {
menu.add(Menu.NONE, MENU_ID_FORGET, 0 /* order */, R.string.forget);
}
}
private boolean canForgetNetwork() {
return mSelectedWifiEntry.canForget() && !WifiUtils.isNetworkLockedDown(getActivity(),
mSelectedWifiEntry.getWifiConfiguration());