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

Commit bacc53ba authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 8c78e030 cf865895

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;

            }