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

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

Merge "Extend FGS ANR timeout for failure-to-post-notification." into main

parents a4176f9a 05b4949e

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

+6 −1
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ public final class ActiveServices { 
                "SHORT_FGS_TIMEOUT");

        this.mServiceFGAnrTimer = new ServiceAnrTimer(service,

                ActivityManagerService.SERVICE_FOREGROUND_TIMEOUT_MSG,

                "SERVICE_FOREGROUND_TIMEOUT");

                "SERVICE_FOREGROUND_TIMEOUT", new AnrTimer.Args().extend(true));

    }



    void systemServicesReady() {
@@ -7702,6 +7702,11 @@ public final class ActiveServices { 
            super(Objects.requireNonNull(am).mHandler, msg, label);

        }



        ServiceAnrTimer(ActivityManagerService am, int msg, String label,

                @NonNull AnrTimer.Args args) {

            super(Objects.requireNonNull(am).mHandler, msg, label, args);

        }



        @Override

        public int getPid(@NonNull ServiceRecord service) {

            return (service.app != null) ? service.app.getPid() : 0;