diff options
| author | 2021-06-14 04:16:23 +0000 | |
|---|---|---|
| committer | 2021-06-14 04:16:23 +0000 | |
| commit | 3d90b48371fdcbd48bcc7010ec14c1633eb97d83 (patch) | |
| tree | 0ff4a0ab59122e29bfd54d5acc4a3bfdd225ca69 | |
| parent | 0edd421d4260336fd0816cb29a132c3699d3e856 (diff) | |
| parent | 827ebe7f15d39fa65cf3172df3cdb01347384ad8 (diff) | |
Merge "Fix NullPointerException in ActiveServices" into sc-dev
| -rw-r--r-- | services/core/java/com/android/server/am/ActiveServices.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 517a8294de9f..8aea4a948299 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -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)) { |