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

Commit 27365877 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use valid metric ids" into udc-dev am: f1cc70e4 

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



Change-Id: Id050e7f6b9efd5e851b500d7ce9ae3215cfb8f80
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8c6fb664 f1cc70e4

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

+5 −5
Original line number Diff line number Diff line
@@ -123,21 +123,21 @@ class JobNotificationCoordinator { 
        if (oldDetails == null) {

            if (jobStatus.startedAsUserInitiatedJob) {

                Counter.logIncrementWithUid(

                        "job_scheduler.value_cntr_w_uid_initial_setNotification_call_required",

                        "job_scheduler.value_cntr_w_uid_initial_set_notification_call_required",

                        jobStatus.getUid());

            } else {

                Counter.logIncrementWithUid(

                        "job_scheduler.value_cntr_w_uid_initial_setNotification_call_optional",

                        "job_scheduler.value_cntr_w_uid_initial_set_notification_call_optional",

                        jobStatus.getUid());

            }

        } else {

            if (jobStatus.startedAsUserInitiatedJob) {

                Counter.logIncrementWithUid(

                        "job_scheduler.value_cntr_w_uid_subsequent_setNotification_call_required",

                        "job_scheduler.value_cntr_w_uid_subsequent_set_notification_call_required",

                        jobStatus.getUid());

            } else {

                Counter.logIncrementWithUid(

                        "job_scheduler.value_cntr_w_uid_subsequent_setNotification_call_optional",

                        "job_scheduler.value_cntr_w_uid_subsequent_set_notification_call_optional",

                        jobStatus.getUid());

            }

            if (oldDetails.notificationId != notificationId) {
@@ -145,7 +145,7 @@ class JobNotificationCoordinator { 
                removeNotificationAssociation(hostingContext, JobParameters.STOP_REASON_UNDEFINED,

                        jobStatus);

                Counter.logIncrementWithUid(

                        "job_scheduler.value_cntr_w_uid_setNotification_changed_notification_ids",

                        "job_scheduler.value_cntr_w_uid_set_notification_changed_notification_ids",

                        jobStatus.getUid());

            }

        }

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

+3 −3
Original line number Diff line number Diff line
@@ -1331,7 +1331,7 @@ public final class JobServiceContext implements ServiceConnection { 
                // FINISHED/NO-RETRY.

                onSlowAppResponseLocked(/* reschedule */ false, /* updateStopReasons */ true,

                        /* texCounterMetricId */

                        "job_scheduler.value_cntr_w_uid_slow_app_response_onStartJob",

                        "job_scheduler.value_cntr_w_uid_slow_app_response_on_start_job",

                        /* debugReason */ "timed out while starting",

                        /* anrMessage */ "No response to onStartJob",

                        CompatChanges.isChangeEnabled(ANR_PRE_UDC_APIS_ON_SLOW_RESPONSES,
@@ -1343,7 +1343,7 @@ public final class JobServiceContext implements ServiceConnection { 
                // other reason.

                onSlowAppResponseLocked(/* reschedule */ true, /* updateStopReasons */ false,

                        /* texCounterMetricId */

                        "job_scheduler.value_cntr_w_uid_slow_app_response_onStopJob",

                        "job_scheduler.value_cntr_w_uid_slow_app_response_on_stop_job",

                        /* debugReason */ "timed out while stopping",

                        /* anrMessage */ "No response to onStopJob",

                        CompatChanges.isChangeEnabled(ANR_PRE_UDC_APIS_ON_SLOW_RESPONSES,
@@ -1400,7 +1400,7 @@ public final class JobServiceContext implements ServiceConnection { 
                } else if (mAwaitingNotification) {

                    onSlowAppResponseLocked(/* reschedule */ true, /* updateStopReasons */ true,

                            /* texCounterMetricId */

                            "job_scheduler.value_cntr_w_uid_slow_app_response_setNotification",

                            "job_scheduler.value_cntr_w_uid_slow_app_response_set_notification",

                            /* debugReason */ "timed out while stopping",

                            /* anrMessage */ "required notification not provided",

                            /* triggerAnr */ true);