commit bacc53baf90c0103059cbfe2eb38d90ef29724c1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Apr 27 19:59:48 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 27 19:59:48 2024 +0000
tree 621fb0bb229598f8c80aeec491b4128cf92bd55a
parent 8c78e0301a7ca843d66825159c1c3401f92a4000
parent cf86589586a70828916061ac438996002aeccc43

Merge "Fix NPE in onFgsTimeout()." into main

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

diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index 96228b2..a6b7809 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -3856,7 +3856,7 @@
     void onFgsTimeout(ServiceRecord sr) {
         synchronized (mAm) {
             final int fgsType = getTimeLimitedFgsType(sr.foregroundServiceType);
-            if (fgsType == ServiceInfo.FOREGROUND_SERVICE_TYPE_NONE) {
+            if (fgsType == ServiceInfo.FOREGROUND_SERVICE_TYPE_NONE || sr.app == null) {
                 mFGSAnrTimer.discard(sr);
                 return;
             }