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

Commit 90ddc829 authored by Makoto Onuki's avatar Makoto Onuki Committed by Automerger Merge Worker
Browse files

Merge "Add a new temp-allowlist reason for "account transfer"" into sc-dev am: c391c730 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13791253

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2bba85c54ca197c38ef416b5493937ee42d2238
parents 75c2a618 c391c730

apex/jobscheduler/framework/java/android/os/PowerExemptionManager.java

+7 −0
Original line number Diff line number Diff line
@@ -193,6 +193,10 @@ public class PowerExemptionManager { 
     * Set temp-allow-list for activity recognition.

     */

    public static final int REASON_ACTIVITY_RECOGNITION = 103;

    /**

     * Set temp-allow-list for transferring accounts between users.

     */

    public static final int REASON_ACCOUNT_TRANSFER = 104;



    /* Reason code range 200-299 are reserved for broadcast actions */

    /**
@@ -329,6 +333,7 @@ public class PowerExemptionManager { 
            REASON_PUSH_MESSAGING,

            REASON_PUSH_MESSAGING_OVER_QUOTA,

            REASON_ACTIVITY_RECOGNITION,

            REASON_ACCOUNT_TRANSFER,

            REASON_BOOT_COMPLETED,

            REASON_PRE_BOOT_COMPLETED,

            REASON_LOCKED_BOOT_COMPLETED,
@@ -579,6 +584,8 @@ public class PowerExemptionManager { 
                return "PUSH_MESSAGING_OVER_QUOTA";

            case REASON_ACTIVITY_RECOGNITION:

                return "ACTIVITY_RECOGNITION";

            case REASON_ACCOUNT_TRANSFER:

                return "REASON_ACCOUNT_TRANSFER";

            case REASON_BOOT_COMPLETED:

                return "BOOT_COMPLETED";

            case REASON_PRE_BOOT_COMPLETED:

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8183,6 +8183,7 @@ package android.os { 
    field public static final int EVENT_MMS = 2; // 0x2

    field public static final int EVENT_SMS = 1; // 0x1

    field public static final int EVENT_UNSPECIFIED = 0; // 0x0

    field public static final int REASON_ACCOUNT_TRANSFER = 104; // 0x68

    field public static final int REASON_ACTIVITY_RECOGNITION = 103; // 0x67

    field public static final int REASON_GEOFENCING = 100; // 0x64

    field public static final int REASON_OTHER = 1; // 0x1