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

Commit 13b502aa authored by Tej Singh's avatar Tej Singh Committed by android-build-merger
Browse files

Merge "Fix error source of system server crashes" into qt-dev am: c6351df4 

am: 6190ff36

Change-Id: Id972777ab8dcba9565bbcd5eea798b628f3a153c
parents b961b37d 6190ff36

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

+4 −1
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ import android.os.storage.IStorageManager; 
import android.os.storage.StorageManager;

import android.provider.DeviceConfig;

import android.provider.Settings;

import android.server.ServerProtoEnums;

import android.sysprop.VoldProperties;

import android.text.TextUtils;

import android.text.format.DateUtils;
@@ -9041,7 +9042,9 @@ public class ActivityManagerService extends IActivityManager.Stub 
                        ? StatsLog.APP_CRASH_OCCURRED__FOREGROUND_STATE__FOREGROUND

                        : StatsLog.APP_CRASH_OCCURRED__FOREGROUND_STATE__BACKGROUND)

                        : StatsLog.APP_CRASH_OCCURRED__FOREGROUND_STATE__UNKNOWN,

                (r != null) ? r.getProcessClassEnum() : 0

                processName.equals("system_server") ? ServerProtoEnums.SYSTEM_SERVER

                        : (r != null) ? r.getProcessClassEnum()

                                      : ServerProtoEnums.ERROR_SOURCE_UNKNOWN

        );















        final int relaunchReason = r == null ? RELAUNCH_REASON_NONE