Merge "Restrict ProviderModelSlice for guest user" into tm-qpr-dev am: ea9b715e78 am: c141388b7a

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

Change-Id: I6e0c72ec59e81b3116f33b74d87823e8b26a7394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-06-21 17:26:25 +00:00
committed by Automerger Merge Worker
2 changed files with 40 additions and 0 deletions

View File

@@ -34,6 +34,7 @@ import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.telephony.SubscriptionManager;
import android.util.EventLog;
import android.util.Log;
import android.view.WindowManager.LayoutParams;
@@ -103,6 +104,12 @@ public class ProviderModelSlice extends WifiSlice {
// Fifth section: Add the Wi-Fi items which are not connected.
// Sixth section: Add the See All item.
final ListBuilder listBuilder = mHelper.createListBuilder(getUri());
if (isGuestUser(mContext)) {
Log.e(TAG, "Guest user is not allowed to configure Internet!");
EventLog.writeEvent(0x534e4554, "227470877", -1 /* UID */, "User is a guest");
return listBuilder.build();
}
int maxListSize = 0;
final NetworkProviderWorker worker = getWorker();
if (worker != null) {
@@ -297,6 +304,8 @@ public class ProviderModelSlice extends WifiSlice {
@Override
public Class getBackgroundWorkerClass() {
if (isGuestUser(mContext)) return null;
return NetworkProviderWorker.class;
}