Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04cceede authored by Pawan Wagh's avatar Pawan Wagh Committed by Gerrit Code Review
Browse files

Merge "Add 16KB pagesize crash details" into main

parents 2417c31f f492f9d0

services/core/java/com/android/server/BootReceiver.java

+18 −10
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.os.TombstoneWithHeadersProto; 
import android.provider.Downloads;

import android.system.ErrnoException;

import android.system.Os;

import android.system.OsConstants;

import android.text.TextUtils;

import android.util.AtomicFile;

import android.util.EventLog;
@@ -230,7 +231,7 @@ public class BootReceiver extends BroadcastReceiver { 
    }



    private static String getCurrentBootHeaders() throws IOException {

        return new StringBuilder(512)

        StringBuilder builder =  new StringBuilder(512)

                .append("Build: ").append(Build.FINGERPRINT).append("\n")

                .append("Hardware: ").append(Build.BOARD).append("\n")

                .append("Revision: ")
@@ -238,8 +239,15 @@ public class BootReceiver extends BroadcastReceiver { 
                .append("Bootloader: ").append(Build.BOOTLOADER).append("\n")

                .append("Radio: ").append(Build.getRadioVersion()).append("\n")

                .append("Kernel: ")

            .append(FileUtils.readTextFile(new File("/proc/version"), 1024, "...\n"))

            .append("\n").toString();

                .append(FileUtils.readTextFile(new File("/proc/version"), 1024, "...\n"));



        // If device is not using 4KB pages, add the PageSize

        long pageSize = Os.sysconf(OsConstants._SC_PAGESIZE);

        if (pageSize != 4096) {

            builder.append("PageSize: ").append(pageSize).append("\n");

        }

        builder.append("\n");

        return builder.toString();

    }

services/core/java/com/android/server/am/ActivityManagerService.java

+9 −0
Original line number Diff line number Diff line
@@ -369,6 +369,8 @@ import android.provider.DeviceConfig; 
import android.provider.Settings;

import android.server.ServerProtoEnums;

import android.sysprop.InitProperties;

import android.system.Os;

import android.system.OsConstants;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.text.style.SuggestionSpan;
@@ -9618,6 +9620,13 @@ public class ActivityManagerService extends IActivityManager.Stub 
            sb.append("ErrorId: ").append(errorId.toString()).append("\n");

        }

        sb.append("Build: ").append(Build.FINGERPRINT).append("\n");













        // If device is not using 4KB pages, add the PageSize













        long pageSize = Os.sysconf(OsConstants._SC_PAGESIZE);













        if (pageSize != 4096) {













            sb.append("PageSize: ").append(pageSize).append("\n");













        }



























        if (Debug.isDebuggerConnected()) {















            sb.append("Debugger: Connected\n");















        }