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

Merge "Set 16K dev option as checked by default for 16KB page size" into main am: 4c647972fe am: 07f71333bc

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

Change-Id: Ic5a19b725b60cc466eba2879b50cdb7b2711bdfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Pawan Wagh
2024-04-30 04:20:46 +00:00
committed by Automerger Merge Worker
parent 874072f2df 07f71333bc
commit 569313f809
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/com/android/settings/development/Enable16kPagesPreferenceController.java
View File

@@ -32,6 +32,8 @@ import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.provider.Settings; import android.provider.Settings;
import android.service.oemlock.OemLockManager; import android.service.oemlock.OemLockManager;
import android.system.Os;
import android.system.OsConstants;
import android.util.Log; import android.util.Log;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.ProgressBar; import android.widget.ProgressBar;
@@ -92,6 +94,9 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen
private static final int OFFSET_TO_FILE_NAME = 30; private static final int OFFSET_TO_FILE_NAME = 30;
public static final String EXPERIMENTAL_UPDATE_TITLE = "Android 16K Kernel Experimental Update"; public static final String EXPERIMENTAL_UPDATE_TITLE = "Android 16K Kernel Experimental Update";
private static final long PAGE_SIZE = Os.sysconf(OsConstants._SC_PAGESIZE);
private static final int PAGE_SIZE_16KB = 16 * 1024;
private @NonNull DevelopmentSettingsDashboardFragment mFragment; private @NonNull DevelopmentSettingsDashboardFragment mFragment;
private boolean mEnable16k; private boolean mEnable16k;
@@ -104,6 +109,7 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen
@NonNull Context context, @NonNull DevelopmentSettingsDashboardFragment fragment) { @NonNull Context context, @NonNull DevelopmentSettingsDashboardFragment fragment) {
super(context); super(context);
this.mFragment = fragment; this.mFragment = fragment;
mEnable16k = (PAGE_SIZE == PAGE_SIZE_16KB);
} }
@Override @Override
@@ -135,11 +141,13 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
int defaultOptionValue =
PAGE_SIZE == PAGE_SIZE_16KB ? ENABLE_16K_PAGE_SIZE : ENABLE_4K_PAGE_SIZE;
final int optionValue = final int optionValue =
Settings.Global.getInt( Settings.Global.getInt(
mContext.getContentResolver(), mContext.getContentResolver(),
Settings.Global.ENABLE_16K_PAGES, Settings.Global.ENABLE_16K_PAGES,
ENABLE_4K_PAGE_SIZE /* default */); defaultOptionValue /* default */);
((SwitchPreference) mPreference).setChecked(optionValue == ENABLE_16K_PAGE_SIZE); ((SwitchPreference) mPreference).setChecked(optionValue == ENABLE_16K_PAGE_SIZE);
} }
@@ -155,6 +163,14 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen
((SwitchPreference) mPreference).setChecked(false); ((SwitchPreference) mPreference).setChecked(false);
} }
@Override
protected void onDeveloperOptionsSwitchEnabled() {
int currentStatus =
PAGE_SIZE == PAGE_SIZE_16KB ? ENABLE_16K_PAGE_SIZE : ENABLE_4K_PAGE_SIZE;
Settings.Global.putInt(
mContext.getContentResolver(), Settings.Global.ENABLE_16K_PAGES, currentStatus);
}
/** Called when user confirms reboot dialog */ /** Called when user confirms reboot dialog */
@Override @Override
public void on16kPagesDialogConfirmed() { public void on16kPagesDialogConfirmed() {
@@ -179,7 +195,7 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen
@Override @Override
public void onFailure(@NonNull Throwable t) { public void onFailure(@NonNull Throwable t) {
hideProgressDialog(); hideProgressDialog();
Log.e(TAG, "Failed to call applyPayload of UpdateEngineStable!"); Log.e(TAG, "Failed to call applyPayload of UpdateEngineStable!", t);
displayToast(mContext.getString(R.string.toast_16k_update_failed_text)); displayToast(mContext.getString(R.string.toast_16k_update_failed_text));
} }
}, },
@@ -188,7 +204,12 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen
/** Called when user dismisses to reboot dialog */ /** Called when user dismisses to reboot dialog */
@Override @Override
public void on16kPagesDialogDismissed() {} public void on16kPagesDialogDismissed() {
if (mPreference == null) {
return;
}
updateState(mPreference);
}
private void installUpdate() { private void installUpdate() {
// Check if there is any pending system update // Check if there is any pending system update
@@ -412,7 +433,6 @@ public class Enable16kPagesPreferenceController extends DeveloperOptionsPreferen
try (BufferedReader br = new BufferedReader(new FileReader("/proc/mounts"))) { try (BufferedReader br = new BufferedReader(new FileReader("/proc/mounts"))) {
String line; String line;
while ((line = br.readLine()) != null) { while ((line = br.readLine()) != null) {
Log.i(TAG, line);
final String[] fields = line.split(" "); final String[] fields = line.split(" ");
final String partition = fields[1]; final String partition = fields[1];
final String fsType = fields[2]; final String fsType = fields[2];