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

Commit a0173caa authored by Varun Shah's avatar Varun Shah Committed by Android Build Coastguard Worker
Browse files

Fix NPE in onFgsTimeout(). 

Fixes: 337451395
Test: atest CtsFgsTimeoutTestCases
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cf86589586a70828916061ac438996002aeccc43)
Merged-In: I37fc893f608142a57b23271aadd4eaf2b26f629b
Change-Id: I37fc893f608142a57b23271aadd4eaf2b26f629b
parent 7e8cb3c2

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

+1 −1
Original line number Diff line number Diff line
@@ -3856,7 +3856,7 @@ public final class ActiveServices { 
    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;

            }