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

Merge "Restrict AddAppNetworksActivity for guest user" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-06-21 17:04:33 +00:00
committed by Android (Google) Code Review
parent 16dfffd6e3 f53f3e6e41
commit 2d0e1dc725
2 changed files with 55 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/wifi/addappnetworks/AddAppNetworksActivity.java
View File

@@ -18,11 +18,14 @@ package com.android.settings.wifi.addappnetworks;
import android.app.ActivityManager;
import android.app.IActivityManager;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.RemoteException;
import android.os.UserManager;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.EventLog;
import android.util.Log;
import android.view.Gravity;
import android.view.Window;
@@ -85,7 +88,13 @@ public class AddAppNetworksActivity extends FragmentActivity {
}
@VisibleForTesting
protected boolean showAddNetworksFragment() {
boolean showAddNetworksFragment() {
if (isGuestUser(getApplicationContext())) {
Log.e(TAG, "Guest user is not allowed to configure Wi-Fi!");
EventLog.writeEvent(0x534e4554, "224772678", -1 /* UID */, "User is a guest");
return false;
}
if (!isAddWifiConfigAllow()) {
Log.d(TAG, "Not allowed by Enterprise Restriction");
return false;
@@ -130,4 +139,11 @@ public class AddAppNetworksActivity extends FragmentActivity {
boolean isAddWifiConfigAllow() {
return WifiEnterpriseRestrictionUtils.isAddWifiConfigAllowed(this);
}
private static boolean isGuestUser(Context context) {
if (context == null) return false;
final UserManager userManager = context.getSystemService(UserManager.class);
if (userManager == null) return false;
return userManager.isGuestUser();
}
}