diff options
| author | 2021-06-09 16:40:26 -0700 | |
|---|---|---|
| committer | 2021-06-09 16:47:50 -0700 | |
| commit | 827ebe7f15d39fa65cf3172df3cdb01347384ad8 (patch) | |
| tree | 7c2d0aab5a5a2b888d7f002eae8c0b8528e051c5 | |
| parent | ad82033c4af5c9cae9565434a65e362e866b0a1d (diff) | |
Fix NullPointerException in ActiveServices
The ProcessRecord field of a ServiceRecord could be null.
Bug: 190634592
Test: atest CtsAppTestCases:ServiceTest
Change-Id: I63abf5be600991a94e6ad4eb26786450cea1e242
| -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 afaddd9c418e..458a286381fc 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -4865,7 +4865,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)) { |