Merge "Restrict DataUsageList for guest user" into tm-qpr-dev am: 5bde972e4e am: f02d69dd4f

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

Change-Id: Ibfe01c87ea15467a736ccaf7d812c8eaffaefa76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-03-30 20:39:38 +00:00
committed by Automerger Merge Worker
2 changed files with 62 additions and 4 deletions

View File

@@ -37,6 +37,7 @@ import android.os.UserManager;
import android.provider.Settings;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.util.EventLog;
import android.util.Log;
import android.util.SparseArray;
import android.view.View;
@@ -134,8 +135,14 @@ public class DataUsageList extends DataUsageBaseFragment
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
final Activity activity = getActivity();
if (isGuestUser(getContext())) {
Log.e(TAG, "This setting isn't available for guest user");
EventLog.writeEvent(0x534e4554, "262741858", -1 /* UID */, "Guest user");
finish();
return;
}
final Activity activity = getActivity();
if (!isBandwidthControlEnabled()) {
Log.w(TAG, "No bandwidth control; leaving");
activity.finish();
@@ -251,9 +258,10 @@ public class DataUsageList extends DataUsageBaseFragment
@Override
public void onDestroy() {
mUidDetailProvider.clearCache();
mUidDetailProvider = null;
if (mUidDetailProvider != null) {
mUidDetailProvider.clearCache();
mUidDetailProvider = null;
}
super.onDestroy();
}
@@ -646,4 +654,11 @@ public class DataUsageList extends DataUsageBaseFragment
}
}
};
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();
}
}