Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I95aca898f119bbcd29fbfc053ae75438a23a2173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-06-07 21:36:57 +00:00
committed by Automerger Merge Worker
parent ea20dd55d7 f1cc70e416
commit b7ac9c7ea3
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apex/jobscheduler/service/java/com/android/server/job/JobNotificationCoordinator.java
View File

@@ -123,21 +123,21 @@ class JobNotificationCoordinator {
if (oldDetails == null) { if (oldDetails == null) {
if (jobStatus.startedAsUserInitiatedJob) { if (jobStatus.startedAsUserInitiatedJob) {
Counter.logIncrementWithUid( 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()); jobStatus.getUid());
} else { } else {
Counter.logIncrementWithUid( 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()); jobStatus.getUid());
} }
} else { } else {
if (jobStatus.startedAsUserInitiatedJob) { if (jobStatus.startedAsUserInitiatedJob) {
Counter.logIncrementWithUid( 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()); jobStatus.getUid());
} else { } else {
Counter.logIncrementWithUid( 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()); jobStatus.getUid());
} }
if (oldDetails.notificationId != notificationId) { if (oldDetails.notificationId != notificationId) {
@@ -145,7 +145,7 @@ class JobNotificationCoordinator {
removeNotificationAssociation(hostingContext, JobParameters.STOP_REASON_UNDEFINED, removeNotificationAssociation(hostingContext, JobParameters.STOP_REASON_UNDEFINED,
jobStatus); jobStatus);
Counter.logIncrementWithUid( 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()); jobStatus.getUid());
} }
} }

6
apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java
View File

@@ -1331,7 +1331,7 @@ public final class JobServiceContext implements ServiceConnection {
// FINISHED/NO-RETRY. // FINISHED/NO-RETRY.
onSlowAppResponseLocked(/* reschedule */ false, /* updateStopReasons */ true, onSlowAppResponseLocked(/* reschedule */ false, /* updateStopReasons */ true,
/* texCounterMetricId */ /* 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", /* debugReason */ "timed out while starting",
/* anrMessage */ "No response to onStartJob", /* anrMessage */ "No response to onStartJob",
CompatChanges.isChangeEnabled(ANR_PRE_UDC_APIS_ON_SLOW_RESPONSES, CompatChanges.isChangeEnabled(ANR_PRE_UDC_APIS_ON_SLOW_RESPONSES,
@@ -1343,7 +1343,7 @@ public final class JobServiceContext implements ServiceConnection {
// other reason. // other reason.
onSlowAppResponseLocked(/* reschedule */ true, /* updateStopReasons */ false, onSlowAppResponseLocked(/* reschedule */ true, /* updateStopReasons */ false,
/* texCounterMetricId */ /* 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", /* debugReason */ "timed out while stopping",
/* anrMessage */ "No response to onStopJob", /* anrMessage */ "No response to onStopJob",
CompatChanges.isChangeEnabled(ANR_PRE_UDC_APIS_ON_SLOW_RESPONSES, CompatChanges.isChangeEnabled(ANR_PRE_UDC_APIS_ON_SLOW_RESPONSES,
@@ -1400,7 +1400,7 @@ public final class JobServiceContext implements ServiceConnection {
} else if (mAwaitingNotification) { } else if (mAwaitingNotification) {
onSlowAppResponseLocked(/* reschedule */ true, /* updateStopReasons */ true, onSlowAppResponseLocked(/* reschedule */ true, /* updateStopReasons */ true,
/* texCounterMetricId */ /* 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", /* debugReason */ "timed out while stopping",
/* anrMessage */ "required notification not provided", /* anrMessage */ "required notification not provided",
/* triggerAnr */ true); /* triggerAnr */ true);