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

Commit dca59bf4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not update AppStandbyController on foreground service events"

parents 9d3b8b30 7e5bf5c5

core/java/android/app/usage/UsageStatsManager.java

+0 −4
Original line number Diff line number Diff line
@@ -193,10 +193,6 @@ public final class UsageStatsManager { 
    /** @hide */

    public static final int REASON_SUB_USAGE_EXEMPTED_SYNC_START = 0x000D;

    /** @hide */

    public static final int REASON_SUB_USAGE_FOREGROUND_SERVICE_START = 0x000E;

    /** @hide */

    public static final int REASON_SUB_USAGE_FOREGROUND_SERVICE_STOP = 0x000F;

    /** @hide */

    public static final int REASON_SUB_PREDICTED_RESTORED       = 0x0001;

services/usage/java/com/android/server/usage/AppStandbyController.java

+0 −8
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ import static android.app.usage.UsageStatsManager.REASON_SUB_USAGE_ACTIVE_TIMEOU 
import static android.app.usage.UsageStatsManager.REASON_SUB_USAGE_EXEMPTED_SYNC_SCHEDULED_DOZE;

import static android.app.usage.UsageStatsManager.REASON_SUB_USAGE_EXEMPTED_SYNC_SCHEDULED_NON_DOZE;

import static android.app.usage.UsageStatsManager.REASON_SUB_USAGE_EXEMPTED_SYNC_START;

import static android.app.usage.UsageStatsManager.REASON_SUB_USAGE_FOREGROUND_SERVICE_START;

import static android.app.usage.UsageStatsManager.REASON_SUB_USAGE_FOREGROUND_SERVICE_STOP;

import static android.app.usage.UsageStatsManager.REASON_SUB_USAGE_MOVE_TO_BACKGROUND;

import static android.app.usage.UsageStatsManager.REASON_SUB_USAGE_MOVE_TO_FOREGROUND;

import static android.app.usage.UsageStatsManager.REASON_SUB_USAGE_NOTIFICATION_SEEN;
@@ -846,8 +844,6 @@ public class AppStandbyController { 
            // Inform listeners if necessary

            if ((event.mEventType == UsageEvents.Event.MOVE_TO_FOREGROUND

                    || event.mEventType == UsageEvents.Event.MOVE_TO_BACKGROUND

                    || event.mEventType == UsageEvents.Event.FOREGROUND_SERVICE_START

                    || event.mEventType == UsageEvents.Event.FOREGROUND_SERVICE_STOP

                    || event.mEventType == UsageEvents.Event.SYSTEM_INTERACTION

                    || event.mEventType == UsageEvents.Event.USER_INTERACTION

                    || event.mEventType == UsageEvents.Event.NOTIFICATION_SEEN
@@ -900,10 +896,6 @@ public class AppStandbyController { 
        switch (eventType) {

            case UsageEvents.Event.MOVE_TO_FOREGROUND: return REASON_SUB_USAGE_MOVE_TO_FOREGROUND;

            case UsageEvents.Event.MOVE_TO_BACKGROUND: return REASON_SUB_USAGE_MOVE_TO_BACKGROUND;

            case UsageEvents.Event.FOREGROUND_SERVICE_START:

                return REASON_SUB_USAGE_FOREGROUND_SERVICE_START;

            case UsageEvents.Event.FOREGROUND_SERVICE_STOP:

                return REASON_SUB_USAGE_FOREGROUND_SERVICE_STOP;

            case UsageEvents.Event.SYSTEM_INTERACTION: return REASON_SUB_USAGE_SYSTEM_INTERACTION;

            case UsageEvents.Event.USER_INTERACTION: return REASON_SUB_USAGE_USER_INTERACTION;

            case UsageEvents.Event.NOTIFICATION_SEEN: return REASON_SUB_USAGE_NOTIFICATION_SEEN;