Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Added SystemApi annotation to REASON_BLUETOOTH_BROADCAST" am: 77b596f2bf am: e1e07765ba am: 6198337c7a

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

Change-Id: Ief519c4bdf208680b8e4a3ab2bc3cced6a4b9f53
This commit is contained in:
Etienne Ruffieux
2022-01-14 09:24:56 +00:00
committed by Automerger Merge Worker
parent 976b3f65d8 6198337c7a
commit 1f6d26d5cb
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apex/jobscheduler/framework/java/android/os/PowerExemptionManager.java
View File

@@ -235,7 +235,6 @@ public class PowerExemptionManager {
public static final int REASON_LOCKED_BOOT_COMPLETED = 202; public static final int REASON_LOCKED_BOOT_COMPLETED = 202;
/** /**
* All Bluetooth broadcasts. * All Bluetooth broadcasts.
* @hide
*/ */
public static final int REASON_BLUETOOTH_BROADCAST = 203; public static final int REASON_BLUETOOTH_BROADCAST = 203;
/** /**

1
core/api/system-current.txt
View File

@@ -8556,6 +8556,7 @@ package android.os {
field public static final int EVENT_UNSPECIFIED = 0; // 0x0 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_ACCOUNT_TRANSFER = 104; // 0x68
field public static final int REASON_ACTIVITY_RECOGNITION = 103; // 0x67 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_GEOFENCING = 100; // 0x64
field public static final int REASON_LOCATION_PROVIDER = 312; // 0x138 field public static final int REASON_LOCATION_PROVIDER = 312; // 0x138
field public static final int REASON_OTHER = 1; // 0x1 field public static final int REASON_OTHER = 1; // 0x1