From 2afc5c26501a33539f10148fbeed1f81828e8928 Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Mon, 27 Feb 2023 13:44:28 -0800 Subject: [PATCH] Fix short-service TODOs Test: atest CtsShortFgsTestCases Bug: 270963079 Change-Id: I4c2aed60c7a712fc1d7f03d565e2574cd724fe4d --- .../core/java/com/android/server/am/ActiveServices.java | 5 +++-- .../core/java/com/android/server/am/EventLogTags.logtags | 6 +++--- services/core/java/com/android/server/am/OomAdjuster.java | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 70304c55067ec..c1850bda609bb 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -7822,7 +7822,7 @@ public final class ActiveServices { final int callerTargetSdkVersion = r.mRecentCallerApplicationInfo != null ? r.mRecentCallerApplicationInfo.targetSdkVersion : 0; - // TODO(short-service): Log BFSL too. + // TODO(short-service): Log the UID capabilities (for BFSL) too, and also the procstate? FrameworkStatsLog.write(FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED, r.appInfo.uid, r.shortInstanceName, @@ -7872,7 +7872,8 @@ public final class ActiveServices { r.mFgsNotificationShown ? 1 : 0, durationMs, r.mStartForegroundCount, - fgsStopReasonToString(fgsStopReason)); + fgsStopReasonToString(fgsStopReason), + r.foregroundServiceType); } private void updateNumForegroundServicesLocked() { diff --git a/services/core/java/com/android/server/am/EventLogTags.logtags b/services/core/java/com/android/server/am/EventLogTags.logtags index 1534ff5651de9..50841ae4488c9 100644 --- a/services/core/java/com/android/server/am/EventLogTags.logtags +++ b/services/core/java/com/android/server/am/EventLogTags.logtags @@ -122,9 +122,9 @@ option java_package com.android.server.am 30091 um_user_visibility_changed (userId|1|5),(visible|1) # Foreground service start/stop events. -30100 am_foreground_service_start (User|1|5),(Component Name|3),(allowWhileInUse|1),(startReasonCode|3),(targetSdk|1|1),(callerTargetSdk|1|1),(notificationWasDeferred|1),(notificationShown|1),(durationMs|1|3),(startForegroundCount|1|1),(stopReason|3) -30101 am_foreground_service_denied (User|1|5),(Component Name|3),(allowWhileInUse|1),(startReasonCode|3),(targetSdk|1|1),(callerTargetSdk|1|1),(notificationWasDeferred|1),(notificationShown|1),(durationMs|1|3),(startForegroundCount|1|1),(stopReason|3) -30102 am_foreground_service_stop (User|1|5),(Component Name|3),(allowWhileInUse|1),(startReasonCode|3),(targetSdk|1|1),(callerTargetSdk|1|1),(notificationWasDeferred|1),(notificationShown|1),(durationMs|1|3),(startForegroundCount|1|1),(stopReason|3) +30100 am_foreground_service_start (User|1|5),(Component Name|3),(allowWhileInUse|1),(startReasonCode|3),(targetSdk|1|1),(callerTargetSdk|1|1),(notificationWasDeferred|1),(notificationShown|1),(durationMs|1|3),(startForegroundCount|1|1),(stopReason|3),(fgsType|1) +30101 am_foreground_service_denied (User|1|5),(Component Name|3),(allowWhileInUse|1),(startReasonCode|3),(targetSdk|1|1),(callerTargetSdk|1|1),(notificationWasDeferred|1),(notificationShown|1),(durationMs|1|3),(startForegroundCount|1|1),(stopReason|3),(fgsType|1) +30102 am_foreground_service_stop (User|1|5),(Component Name|3),(allowWhileInUse|1),(startReasonCode|3),(targetSdk|1|1),(callerTargetSdk|1|1),(notificationWasDeferred|1),(notificationShown|1),(durationMs|1|3),(startForegroundCount|1|1),(stopReason|3),(fgsType|1) # Intent Sender redirect for UserHandle.USER_CURRENT 30110 am_intent_sender_redirect_user (userId|1|5) diff --git a/services/core/java/com/android/server/am/OomAdjuster.java b/services/core/java/com/android/server/am/OomAdjuster.java index 0c366268604de..d05301a21a18c 100644 --- a/services/core/java/com/android/server/am/OomAdjuster.java +++ b/services/core/java/com/android/server/am/OomAdjuster.java @@ -207,7 +207,8 @@ public class OomAdjuster { return AppProtoEnums.OOM_ADJ_REASON_PROCESS_BEGIN; case OOM_ADJ_REASON_PROCESS_END: return AppProtoEnums.OOM_ADJ_REASON_PROCESS_END; - case OOM_ADJ_REASON_SHORT_FGS_TIMEOUT: // TODO(short-service) add value to AppProtoEnums + case OOM_ADJ_REASON_SHORT_FGS_TIMEOUT: + return AppProtoEnums.OOM_ADJ_REASON_SHORT_FGS_TIMEOUT; default: return AppProtoEnums.OOM_ADJ_REASON_UNKNOWN_TO_PROTO; }