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

Commit 83335e48 authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "Added SystemApi annotation to REASON_BLUETOOTH_BROADCAST" am:... 

Merge "Added SystemApi annotation to REASON_BLUETOOTH_BROADCAST" am: 77b596f2 am: e1e07765 am: 6198337c am: 1f6d26d5

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

Change-Id: Iba33aecaa4ee7e4fd207db7b64e23214cc131cfb
parents 3187fca2 1f6d26d5

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

+0 −1
Original line number Diff line number Diff line
@@ -235,7 +235,6 @@ public class PowerExemptionManager { 
    public static final int REASON_LOCKED_BOOT_COMPLETED = 202;

    /**

     * All Bluetooth broadcasts.

     * @hide

     */

    public static final int REASON_BLUETOOTH_BROADCAST = 203;

    /**

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9155,6 +9155,7 @@ package android.os { 
    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_BLUETOOTH_BROADCAST = 203; // 0xcb

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

    field public static final int REASON_LOCATION_PROVIDER = 312; // 0x138

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