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

Commit 93c6045a authored by Amith Yamasani's avatar Amith Yamasani Committed by android-build-merger
Browse files

Merge "Add slice pinning to list of reasons for usage" into pi-dev 

am: 37594c89

Change-Id: I90264decb0d458dc084e3c484a6716058ca58a63
parents 0a73c93b 37594c89

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

+10 −0
Original line number Diff line number Diff line
@@ -179,6 +179,10 @@ public final class UsageStatsManager { 
    public static final int REASON_SUB_USAGE_ACTIVE_TIMEOUT     = 0x0007;

    /** @hide */

    public static final int REASON_SUB_USAGE_SYNC_ADAPTER       = 0x0008;

    /** @hide */

    public static final int REASON_SUB_USAGE_SLICE_PINNED       = 0x0009;

    /** @hide */

    public static final int REASON_SUB_USAGE_SLICE_PINNED_PRIV  = 0x000A;



    /** @hide */

    @IntDef(flag = false, prefix = { "STANDBY_BUCKET_" }, value = {
@@ -647,6 +651,12 @@ public final class UsageStatsManager { 
                    case REASON_SUB_USAGE_SYNC_ADAPTER:

                        sb.append("sa");

                        break;

                    case REASON_SUB_USAGE_SLICE_PINNED:

                        sb.append("slp");

                        break;

                    case REASON_SUB_USAGE_SLICE_PINNED_PRIV:

                        sb.append("slpp");

                        break;

                }

                break;

        }

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

+4 −1
Original line number Diff line number Diff line
@@ -30,13 +30,14 @@ import static android.app.usage.UsageStatsManager.REASON_SUB_USAGE_SYNC_ADAPTER; 
import static android.app.usage.UsageStatsManager.REASON_SUB_USAGE_SYSTEM_INTERACTION;

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

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

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

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

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

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

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

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

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

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



import static com.android.server.SystemService.PHASE_BOOT_COMPLETED;

import static com.android.server.SystemService.PHASE_SYSTEM_SERVICES_READY;
@@ -747,6 +748,8 @@ public class AppStandbyController { 
            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;

            case UsageEvents.Event.SLICE_PINNED: return REASON_SUB_USAGE_SLICE_PINNED;

            case UsageEvents.Event.SLICE_PINNED_PRIV: return REASON_SUB_USAGE_SLICE_PINNED_PRIV;

            default: return 0;

        }

    }