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

Commit f4ae99c5 authored by Kweku Adams's avatar Kweku Adams Committed by Automerger Merge Worker
Browse files

Merge "Treat ANR as an app failure." into udc-dev am: 17885fb6 am: 73318953 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23266916



Change-Id: Iae9c1c8f5486d746e543f91ca3f3ef7e1b956ff6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a9e283c3 73318953

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());

    }



    /**