Developer option for booting with 16K pages
Adding developer option to boot with 16K compatible kernel. Adding
resources, layouts and dialog classes for 16k option. This needs
to integrated with update engine to make OTA switch happen.
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Bug: 294614538
Change-Id: I3a24fed059eee99407e3486a7254285e0e4a251c
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7118886..09e687e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -11325,6 +11325,15 @@
<!-- Developer Settings: Search keywords for the Profile HWUI rendering. [CHAR_LIMIT=NONE] -->
<string name="track_frame_time_keywords">GPU</string>
+ <!-- setting Checkbox title whether to boot with 16K page size [CHAR_LIMIT=35] -->
+ <string name="enable_16k_pages">Boot with 16K page size</string>
+ <!-- setting Checkbox summary whether to boot with 16K page size[CHAR_LIMIT=50] -->
+ <string name="enable_16k_pages_summary">Boot device using 16K page size supported kernel</string>
+ <!-- Confirmation dialog title to ensure user wishes to enable 16K page size -->
+ <string name="confirm_enable_16k_pages_title">Reboot with 16K page compatible kernel?</string>
+ <!-- Warning dialog message to confirm user wishes to enable 16K page size -->
+ <string name="confirm_enable_16k_pages_text">WARNING: Some applications may not be compatible with this mode</string>
+
<!-- DSU Loader. Do not translate. -->
<string name="dsu_loader_title" translatable="false">DSU Loader</string>
<!-- DSU Loader Description. Do not translate. -->
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 32acac6..c11829c 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -107,6 +107,12 @@
android:summary="@string/oem_unlock_enable_summary"
settings:useAdditionalSummary="true" />
+ <SwitchPreference
+ android:key="enable_16k_pages"
+ android:title="@string/enable_16k_pages"
+ android:summary="@string/enable_16k_pages_summary"
+ settings:useAdditionalSummary="true" />
+
<Preference
android:key="running_apps"
android:title="@string/runningservices_settings_title"
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 047b219..7c49956 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -628,6 +628,7 @@
controllers.add(new BluetoothSnoopLogFilterProfilePbapPreferenceController(context));
controllers.add(new BluetoothSnoopLogFilterProfileMapPreferenceController(context));
controllers.add(new OemUnlockPreferenceController(context, activity, fragment));
+ controllers.add(new Enable16kPagesPreferenceController(context, fragment));
controllers.add(new PictureColorModePreferenceController(context, lifecycle));
controllers.add(new WebViewAppPreferenceController(context));
controllers.add(new CoolColorTemperaturePreferenceController(context));
diff --git a/src/com/android/settings/development/Enable16kPagesPreferenceController.java b/src/com/android/settings/development/Enable16kPagesPreferenceController.java
new file mode 100644
index 0000000..9aadd73
--- /dev/null
+++ b/src/com/android/settings/development/Enable16kPagesPreferenceController.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.provider.Settings;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+/** Controller for 16K pages developer option */
+public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferenceController
+ implements Preference.OnPreferenceChangeListener,
+ PreferenceControllerMixin,
+ Enable16kbPagesDialogHost {
+
+ private static final String ENABLE_16K_PAGES = "enable_16k_pages";
+ private static final String DEV_OPTION_PROPERTY = "ro.product.build.16k_page.enabled";
+ private static final int ENABLE_4K_PAGE_SIZE = 0;
+ private static final int ENABLE_16K_PAGE_SIZE = 1;
+
+ private @Nullable DevelopmentSettingsDashboardFragment mFragment = null;
+
+ public Enable16kPagesPreferenceController(
+ @NonNull Context context, @Nullable DevelopmentSettingsDashboardFragment fragment) {
+ super(context);
+ mFragment = fragment;
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return SystemProperties.getBoolean(DEV_OPTION_PROPERTY, false);
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return ENABLE_16K_PAGES;
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ final boolean optionEnabled = (Boolean) newValue;
+ if (optionEnabled) {
+ Enable16kPagesWarningDialog.show(mFragment, this);
+ } else {
+ // TODO(b/295573133):Directly reboot into 4k
+ }
+ return true;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ final int optionValue =
+ Settings.Global.getInt(
+ mContext.getContentResolver(),
+ Settings.Global.ENABLE_16K_PAGES,
+ ENABLE_4K_PAGE_SIZE /* default */);
+
+ ((SwitchPreference) mPreference).setChecked(optionValue == ENABLE_16K_PAGE_SIZE);
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchDisabled() {
+ // TODO(b/295573133):Directly reboot into 4k
+ super.onDeveloperOptionsSwitchDisabled();
+ Settings.Global.putInt(
+ mContext.getContentResolver(),
+ Settings.Global.ENABLE_16K_PAGES,
+ ENABLE_4K_PAGE_SIZE);
+ ((SwitchPreference) mPreference).setChecked(false);
+ }
+
+ /** Called when user confirms reboot dialog */
+ @Override
+ public void on16kPagesDialogConfirmed() {
+ // TODO(b/295573133) : integrate update engine
+ }
+
+ /** Called when user dismisses to reboot dialog */
+ @Override
+ public void on16kPagesDialogDismissed() {}
+}
diff --git a/src/com/android/settings/development/Enable16kPagesWarningDialog.java b/src/com/android/settings/development/Enable16kPagesWarningDialog.java
new file mode 100644
index 0000000..f141c93
--- /dev/null
+++ b/src/com/android/settings/development/Enable16kPagesWarningDialog.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+import android.app.Dialog;
+import android.app.settings.SettingsEnums;
+import android.content.DialogInterface;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
+/** Dialog when user interacts 16K pages developer option */
+public class Enable16kPagesWarningDialog extends InstrumentedDialogFragment
+ implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
+
+ public static final String TAG = "Enable16KDialog";
+
+ private Enable16kbPagesDialogHost mHost;
+
+ private void setHost(@NonNull Enable16kbPagesDialogHost host) {
+ mHost = host;
+ }
+
+ /** Used to display warning dialog */
+ public static void show(
+ @NonNull Fragment hostFragment, @NonNull Enable16kbPagesDialogHost dialogHost) {
+ final FragmentManager manager = hostFragment.getActivity().getSupportFragmentManager();
+ Fragment existingFragment = manager.findFragmentByTag(TAG);
+ if (existingFragment == null) {
+ existingFragment = new Enable16kPagesWarningDialog();
+ existingFragment.setTargetFragment(hostFragment, 0 /* requestCode */);
+ }
+
+ if (existingFragment instanceof Enable16kPagesWarningDialog) {
+ ((Enable16kPagesWarningDialog) existingFragment).setHost(dialogHost);
+ ((Enable16kPagesWarningDialog) existingFragment).show(manager, TAG);
+ }
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.DIALOG_ENABLE_16K_PAGES;
+ }
+
+ @NonNull
+ @Override
+ public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+ return new AlertDialog.Builder(getActivity())
+ .setTitle(R.string.confirm_enable_16k_pages_title)
+ .setMessage(R.string.confirm_enable_16k_pages_text)
+ .setPositiveButton(android.R.string.ok, this /* onClickListener */)
+ .setNegativeButton(android.R.string.cancel, this /* onClickListener */)
+ .create();
+ }
+
+ @Override
+ public void onClick(@NonNull DialogInterface dialog, int buttonId) {
+ if (buttonId == DialogInterface.BUTTON_POSITIVE) {
+ mHost.on16kPagesDialogConfirmed();
+ } else {
+ mHost.on16kPagesDialogDismissed();
+ }
+ }
+
+ @Override
+ public void onDismiss(@NonNull DialogInterface dialog) {
+ super.onDismiss(dialog);
+ mHost.on16kPagesDialogDismissed();
+ }
+}
diff --git a/src/com/android/settings/development/Enable16kbPagesDialogHost.java b/src/com/android/settings/development/Enable16kbPagesDialogHost.java
new file mode 100644
index 0000000..fc54bd4
--- /dev/null
+++ b/src/com/android/settings/development/Enable16kbPagesDialogHost.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development;
+
+/** Interface for Enable16kbPagesDialogHost callbacks. */
+public interface Enable16kbPagesDialogHost {
+ /** Callback when the user presses ok the warning dialog. */
+ void on16kPagesDialogConfirmed();
+
+ /** Callback when the user cancels or dismisses the warning dialog. */
+ void on16kPagesDialogDismissed();
+}