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

Commit 635104a3 authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Fix NullPointerException in ActiveServices" into sc-dev am: 3d90b483 

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

Change-Id: Ic7f7023a6ea5a31fd7ce603e2e07c43bcbcbaf6f
parents 6f308205 3d90b483

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

+2 −1
Original line number Diff line number Diff line
@@ -4908,7 +4908,8 @@ public final class ActiveServices { 
                Slog.w(TAG, "Service crashed " + sr.crashCount

                        + " times, stopping: " + sr);

                EventLog.writeEvent(EventLogTags.AM_SERVICE_CRASHED_TOO_MUCH,

                        sr.userId, sr.crashCount, sr.shortInstanceName, sr.app.getPid());

                        sr.userId, sr.crashCount, sr.shortInstanceName,

                        sr.app != null ? sr.app.getPid() : -1);

                bringDownServiceLocked(sr, true);

            } else if (!allowRestart

                    || !mAm.mUserController.isUserRunning(sr.userId, 0)) {