Merge "Toast warning message when non-admin user tries to open dev options." into main

This commit is contained in:
Nikhil Kumar
2024-01-12 10:43:32 +00:00
committed by Android (Google) Code Review
2 changed files with 13 additions and 2 deletions

View File

@@ -233,7 +233,14 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
return;
}
Context context = requireContext();
if (!DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context)) {
UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
if (!um.isAdminUser()) {
Toast.makeText(context, R.string.dev_settings_available_to_admin_only_warning,
Toast.LENGTH_SHORT)
.show();
finish();
} else if (!DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context)) {
Toast.makeText(context, R.string.dev_settings_disabled_warning, Toast.LENGTH_SHORT)
.show();
finish();