diff options
| author | 2023-05-31 19:19:11 +0000 | |
|---|---|---|
| committer | 2023-05-31 19:19:11 +0000 | |
| commit | 0f3698d8c42c8d2497307f2c0c1fe60a61a99746 (patch) | |
| tree | 6456b2aadea742ed18e15b27fb364118b648af70 | |
| parent | 9a350627142135febbd5f655da3427cc5645a2a7 (diff) | |
| parent | 5e1b258dd5beca122cef6dc2cb857bd559db9bc3 (diff) | |
Merge "Add BATTERY_PLUGGED_ANY constant to @TestApis."
| -rw-r--r-- | core/api/test-current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/os/BatteryManager.java | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index dc0166285cbb..6e61569a8352 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -1697,6 +1697,10 @@ package android.net { package android.os { + public class BatteryManager { + field public static final int BATTERY_PLUGGED_ANY = 15; // 0xf + } + public final class BatteryStatsManager { method @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public void resetBattery(boolean); method @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public void setBatteryLevel(int, boolean); diff --git a/core/java/android/os/BatteryManager.java b/core/java/android/os/BatteryManager.java index 6bc0f6ea947c..092923e927a3 100644 --- a/core/java/android/os/BatteryManager.java +++ b/core/java/android/os/BatteryManager.java @@ -20,6 +20,7 @@ import android.Manifest.permission; import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.annotation.SystemService; +import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.Intent; @@ -232,6 +233,7 @@ public class BatteryManager { OsProtoEnums.CHARGING_POLICY_ADAPTIVE_LONGLIFE; // = 4 /** @hide */ + @TestApi public static final int BATTERY_PLUGGED_ANY = BATTERY_PLUGGED_AC | BATTERY_PLUGGED_USB | BATTERY_PLUGGED_WIRELESS | BATTERY_PLUGGED_DOCK; |