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

Commit 38535974 authored by Pawan Wagh's avatar Pawan Wagh Committed by Automerger Merge Worker
Browse files

Merge "Add 16KB pagesize crash details" into main am: 04cceede 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3093707



Change-Id: I5e9862e34f8b44d0791c057d2115e7727693e77e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cc00e10c 04cceede

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

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

import android.provider.Downloads;

import android.system.ErrnoException;

import android.system.ErrnoException;

import android.system.Os;

import android.system.Os;

import android.system.OsConstants;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.AtomicFile;

import android.util.AtomicFile;

import android.util.EventLog;

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

    }





    private static String getCurrentBootHeaders() throws IOException {

    private static String getCurrentBootHeaders() throws IOException {

        return new StringBuilder(512)

        StringBuilder builder =  new StringBuilder(512)

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

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

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

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

                .append("Revision: ")

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

                .append("Bootloader: ").append(Build.BOOTLOADER).append("\n")

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

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

                .append("Kernel: ")

                .append("Kernel: ")

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

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

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



        // 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 Original line Diff line number Diff line
@@ -369,6 +369,8 @@ import android.provider.DeviceConfig; 
import android.provider.Settings;

import android.provider.Settings;

import android.server.ServerProtoEnums;

import android.server.ServerProtoEnums;

import android.sysprop.InitProperties;

import android.sysprop.InitProperties;

import android.system.Os;

import android.system.OsConstants;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.text.TextUtils;

import android.text.style.SuggestionSpan;

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("ErrorId: ").append(errorId.toString()).append("\n");

        }

        }

        sb.append("Build: ").append(Build.FINGERPRINT).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()) {







        if (Debug.isDebuggerConnected()) {











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







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











        }







        }