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()) { if (Utils.isMonkeyRunning()) {
return; 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); DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(getContext(), false);
final SystemPropPoker poker = SystemPropPoker.getInstance(); final SystemPropPoker poker = SystemPropPoker.getInstance();
poker.blockPokes(); poker.blockPokes();

10
src/com/android/settings/development/Enable16kUtils.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.development; package com.android.settings.development;
import android.content.Context; import android.content.Context;
import android.content.Intent;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
@@ -116,4 +117,13 @@ public class Enable16kUtils {
public static boolean isUsing16kbPages() { public static boolean isUsing16kbPages() {
return PAGE_SIZE == PAGE_SIZE_16KB; return PAGE_SIZE == PAGE_SIZE_16KB;
} }
/**
* show page-agnostic mode warning dialog to user
* @param context to start activity
*/
public static void showPageAgnosticWarning(@NonNull Context context) {
Intent intent = new Intent(context, PageAgnosticWarningActivity.class);
context.startActivityAsUser(intent, UserHandle.SYSTEM);
}
} }