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

Merge "Fix short-service TODOs" into udc-dev

Browse Source
This commit is contained in:
Makoto Onuki
2023-02-28 19:31:36 +00:00
committed by Android (Google) Code Review
parent 1279268a7b 2afc5c2650
commit 7d668ceda5
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -7822,7 +7822,7 @@ public final class ActiveServices {
final int callerTargetSdkVersion = r.mRecentCallerApplicationInfo != null final int callerTargetSdkVersion = r.mRecentCallerApplicationInfo != null
? r.mRecentCallerApplicationInfo.targetSdkVersion : 0; ? 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, FrameworkStatsLog.write(FrameworkStatsLog.FOREGROUND_SERVICE_STATE_CHANGED,
r.appInfo.uid, r.appInfo.uid,
r.shortInstanceName, r.shortInstanceName,
@@ -7872,7 +7872,8 @@ public final class ActiveServices {
r.mFgsNotificationShown ? 1 : 0, r.mFgsNotificationShown ? 1 : 0,
durationMs, durationMs,
r.mStartForegroundCount, r.mStartForegroundCount,
fgsStopReasonToString(fgsStopReason)); fgsStopReasonToString(fgsStopReason),
r.foregroundServiceType);
} }
private void updateNumForegroundServicesLocked() { private void updateNumForegroundServicesLocked() {

6
services/core/java/com/android/server/am/EventLogTags.logtags
View File

@@ -122,9 +122,9 @@ option java_package com.android.server.am
30091 um_user_visibility_changed (userId|1|5),(visible|1) 30091 um_user_visibility_changed (userId|1|5),(visible|1)
# Foreground service start/stop events. # 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) 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) 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) 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 # Intent Sender redirect for UserHandle.USER_CURRENT
30110 am_intent_sender_redirect_user (userId|1|5) 30110 am_intent_sender_redirect_user (userId|1|5)

3
services/core/java/com/android/server/am/OomAdjuster.java
View File

@@ -207,7 +207,8 @@ public class OomAdjuster {
return AppProtoEnums.OOM_ADJ_REASON_PROCESS_BEGIN; return AppProtoEnums.OOM_ADJ_REASON_PROCESS_BEGIN;
case OOM_ADJ_REASON_PROCESS_END: case OOM_ADJ_REASON_PROCESS_END:
return AppProtoEnums.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: default:
return AppProtoEnums.OOM_ADJ_REASON_UNKNOWN_TO_PROTO; return AppProtoEnums.OOM_ADJ_REASON_UNKNOWN_TO_PROTO;
} }