diff options
| author | 2022-01-14 09:24:56 +0000 | |
|---|---|---|
| committer | 2022-01-14 09:24:56 +0000 | |
| commit | 1f6d26d5cbe87a6779a5df8af27e3ae6802113cc (patch) | |
| tree | ab12f192c6a3a75d98d11f0341ec98d04b0ed2c7 | |
| parent | 976b3f65d82e855cab604f7240b57a4879ac506e (diff) | |
| parent | 6198337c7a97dc138aaab06eb8f54f43c0afaa7c (diff) | |
Merge "Added SystemApi annotation to REASON_BLUETOOTH_BROADCAST" am: 77b596f2bf am: e1e07765ba am: 6198337c7a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1946687
Change-Id: Ief519c4bdf208680b8e4a3ab2bc3cced6a4b9f53
| -rw-r--r-- | apex/jobscheduler/framework/java/android/os/PowerExemptionManager.java | 1 | ||||
| -rw-r--r-- | core/api/system-current.txt | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/apex/jobscheduler/framework/java/android/os/PowerExemptionManager.java b/apex/jobscheduler/framework/java/android/os/PowerExemptionManager.java index a1a46afcffe6..161a317b2a3c 100644 --- a/apex/jobscheduler/framework/java/android/os/PowerExemptionManager.java +++ b/apex/jobscheduler/framework/java/android/os/PowerExemptionManager.java @@ -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; /** diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 14e86ce0c798..e2a9a7bc1688 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -8556,6 +8556,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 |