diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-07-23 01:11:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-07-23 01:11:41 +0000 |
| commit | fd94d33a17226c09bfebe3c544fa034d7f4d864a (patch) | |
| tree | 4b11248246392f3ebb449e4e79985974da1928b5 /apex | |
| parent | 24706f065456f29ff35de848231006ab2746c9b4 (diff) | |
| parent | ef2636a43a5da876def5c0096c4c2f2c507f5feb (diff) | |
Merge "Logging the caller uid state with AlarmScheduled atom" into sc-dev
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java | 3 | ||||
| -rw-r--r-- | apex/jobscheduler/service/java/com/android/server/alarm/MetricsHelper.java | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java index 98e963e113e6..86fa06cdb8dc 100644 --- a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java +++ b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java @@ -2052,10 +2052,11 @@ public class AlarmManagerService extends SystemService { + " -- package not allowed to start"); return; } + final int callerProcState = mActivityManagerInternal.getUidProcessState(callingUid); removeLocked(operation, directReceiver, REMOVE_REASON_UNDEFINED); incrementAlarmCount(a.uid); setImplLocked(a); - MetricsHelper.pushAlarmScheduled(a); + MetricsHelper.pushAlarmScheduled(a, callerProcState); } /** diff --git a/apex/jobscheduler/service/java/com/android/server/alarm/MetricsHelper.java b/apex/jobscheduler/service/java/com/android/server/alarm/MetricsHelper.java index 4e7311f10252..4c2f8d124566 100644 --- a/apex/jobscheduler/service/java/com/android/server/alarm/MetricsHelper.java +++ b/apex/jobscheduler/service/java/com/android/server/alarm/MetricsHelper.java @@ -22,6 +22,7 @@ import static com.android.internal.util.FrameworkStatsLog.ALARM_SCHEDULED__EXACT import static com.android.internal.util.FrameworkStatsLog.ALARM_SCHEDULED__EXACT_ALARM_ALLOWED_REASON__PERMISSION; import static com.android.server.alarm.AlarmManagerService.INDEFINITE_DELAY; +import android.app.ActivityManager; import android.app.AlarmManager; import android.app.StatsManager; import android.content.Context; @@ -93,7 +94,7 @@ class MetricsHelper { } } - static void pushAlarmScheduled(Alarm a) { + static void pushAlarmScheduled(Alarm a, int callerProcState) { FrameworkStatsLog.write( FrameworkStatsLog.ALARM_SCHEDULED, a.uid, @@ -103,7 +104,8 @@ class MetricsHelper { a.alarmClock != null, a.repeatInterval != 0, reasonToStatsReason(a.mExactAllowReason), - AlarmManagerService.isRtc(a.type)); + AlarmManagerService.isRtc(a.type), + ActivityManager.processStateAmToProto(callerProcState)); } static void pushAlarmBatchDelivered(int numAlarms, int wakeups) { |