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

Commit 17885fb6 authored by Kweku Adams's avatar Kweku Adams Committed by Android (Google) Code Review
Browse files

Merge "Treat ANR as an app failure." into udc-dev

parents 7d68bdc4 6b4693ff

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+1 −0
Original line number Diff line number Diff line
@@ -2595,6 +2595,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
        // or the user stopped the job somehow.

        if (internalStopReason == JobParameters.INTERNAL_STOP_REASON_SUCCESSFUL_FINISH

                || internalStopReason == JobParameters.INTERNAL_STOP_REASON_TIMEOUT

                || internalStopReason == JobParameters.INTERNAL_STOP_REASON_ANR

                || stopReason == JobParameters.STOP_REASON_USER) {

            numFailures++;

        } else {

services/tests/mockingservicestests/src/com/android/server/job/JobSchedulerServiceTest.java

+7 −0
Original line number Diff line number Diff line
@@ -440,6 +440,13 @@ public class JobSchedulerServiceTest { 
                JobParameters.INTERNAL_STOP_REASON_SUCCESSFUL_FINISH);

        assertEquals(nowElapsed + 4 * initialBackoffMs, rescheduledJob.getEarliestRunTime());

        assertEquals(JobStatus.NO_LATEST_RUNTIME, rescheduledJob.getLatestRunTimeElapsed());



        // failure = 3, systemStop = 2 * SYSTEM_STOP_TO_FAILURE_RATIO

        rescheduledJob = mService.getRescheduleJobForFailureLocked(rescheduledJob,

                JobParameters.STOP_REASON_UNDEFINED,

                JobParameters.INTERNAL_STOP_REASON_ANR);

        assertEquals(nowElapsed + 5 * initialBackoffMs, rescheduledJob.getEarliestRunTime());

        assertEquals(JobStatus.NO_LATEST_RUNTIME, rescheduledJob.getLatestRunTimeElapsed());

    }



    /**