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

Commit 7d668ced authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

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

parents 1279268a 2afc5c26

services/core/java/com/android/server/am/ActiveServices.java

+3 −2
Original line number Diff line number Diff line
@@ -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() {

services/core/java/com/android/server/am/EventLogTags.logtags

+3 −3
Original line number Diff line number Diff line
@@ -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)

services/core/java/com/android/server/am/OomAdjuster.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

        }