Merge "Restrict AddAppNetworksActivity for guest user" into tm-qpr-dev am: 2d0e1dc725
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910990 Change-Id: Iac11c8a9834528d81cb757a85a5bcaed7c8b8035 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user