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

Merge "Disallow turning off developer options in page-agnostic mode" into main am: 0d124654ca am: 74da70de2d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3073278

Change-Id: I985bf4d4f78e2d17915d330430eae5818e7fb44b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-05-07 07:03:35 +00:00
committed by Automerger Merge Worker
parent ecfed70bb3 74da70de2d
commit f671734c1b
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -595,6 +595,15 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
if (Utils.isMonkeyRunning()) {
return;
}
// Disabling developer options in page-agnostic mode isn't supported as device isn't in
// production state
if (Enable16kUtils.isPageAgnosticModeOn(getContext())) {
Enable16kUtils.showPageAgnosticWarning(getContext());
onDisableDevelopmentOptionsRejected();
return;
}
DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(getContext(), false);
final SystemPropPoker poker = SystemPropPoker.getInstance();
poker.blockPokes();