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

Merge "Restrict WifiDppConfiguratorActivity" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-04-03 08:18:15 +00:00
committed by Android (Google) Code Review
parent c310438a82 2101258e8a
commit cdd9b78e22
4 changed files with 188 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/wifi/AddNetworkFragment.java
View File

@@ -16,12 +16,17 @@
package com.android.settings.wifi;
import static android.os.UserManager.DISALLOW_ADD_WIFI_CONFIG;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.os.UserManager;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -43,6 +48,7 @@ import com.android.settings.wifi.dpp.WifiDppUtils;
*/
public class AddNetworkFragment extends InstrumentedFragment implements WifiConfigUiBase2,
View.OnClickListener {
private static final String TAG = "AddNetworkFragment";
public static final String WIFI_CONFIG_KEY = "wifi_config_key";
@VisibleForTesting
@@ -62,6 +68,10 @@ public class AddNetworkFragment extends InstrumentedFragment implements WifiConf
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (!isAddWifiConfigAllowed(getContext())) {
getActivity().finish();
return;
}
}
@Override
@@ -237,4 +247,14 @@ public class AddNetworkFragment extends InstrumentedFragment implements WifiConf
activity.setResult(Activity.RESULT_CANCELED);
activity.finish();
}
@VisibleForTesting
static boolean isAddWifiConfigAllowed(Context context) {
UserManager userManager = context.getSystemService(UserManager.class);
if (userManager != null && userManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)) {
Log.e(TAG, "The user is not allowed to add Wi-Fi configuration.");
return false;
}
return true;
}
}

20
src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.wifi.dpp;
import static android.os.UserManager.DISALLOW_ADD_WIFI_CONFIG;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.content.Intent;
@@ -99,6 +101,10 @@ public class WifiDppConfiguratorActivity extends WifiDppBaseActivity implements
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (!isAddWifiConfigAllowed(getApplicationContext())) {
finish();
return;
}
if (savedInstanceState != null) {
String qrCode = savedInstanceState.getString(KEY_QR_CODE);
@@ -119,6 +125,10 @@ public class WifiDppConfiguratorActivity extends WifiDppBaseActivity implements
@Override
protected void handleIntent(Intent intent) {
if (!isAddWifiConfigAllowed(getApplicationContext())) {
finish();
return;
}
if (isGuestUser(getApplicationContext())) {
Log.e(TAG, "Guest user is not allowed to configure Wi-Fi!");
EventLog.writeEvent(0x534e4554, "224772890", -1 /* UID */, "User is a guest");
@@ -402,4 +412,14 @@ public class WifiDppConfiguratorActivity extends WifiDppBaseActivity implements
if (userManager == null) return false;
return userManager.isGuestUser();
}
@VisibleForTesting
static boolean isAddWifiConfigAllowed(Context context) {
UserManager userManager = context.getSystemService(UserManager.class);
if (userManager != null && userManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)) {
Log.e(TAG, "The user is not allowed to add Wi-Fi configuration.");
return false;
}
return true;
}
}