diff options
| author | 2023-10-26 22:26:04 +0000 | |
|---|---|---|
| committer | 2023-10-26 22:26:04 +0000 | |
| commit | 88f186eee85ce7972e6df1760eafb61c00a62a63 (patch) | |
| tree | 334e8f7bf187cb42ba3625c620eaf4b919cb96e5 | |
| parent | 53087582ad5c3e7a0f624c86618aebff3f78bbaf (diff) | |
| parent | 2fa323d862ee4033c9e42fcb59b04e195990f9a7 (diff) | |
Merge "Introduce battery_saver_supported_check_api flag" into main
| -rw-r--r-- | core/api/test-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/os/PowerManager.java | 2 | ||||
| -rw-r--r-- | core/java/android/os/flags.aconfig | 7 |
3 files changed, 10 insertions, 1 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 249ca4dc364b..e130206d49fa 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -2287,7 +2287,7 @@ package android.os { public final class PowerManager { method public boolean areAutoPowerSaveModesEnabled(); method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_LOW_POWER_STANDBY, android.Manifest.permission.DEVICE_POWER}) public void forceLowPowerStandbyActive(boolean); - method public boolean isBatterySaverSupported(); + method @FlaggedApi("android.os.battery_saver_supported_check_api") public boolean isBatterySaverSupported(); field public static final String ACTION_ENHANCED_DISCHARGE_PREDICTION_CHANGED = "android.os.action.ENHANCED_DISCHARGE_PREDICTION_CHANGED"; field @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public static final int SYSTEM_WAKELOCK = -2147483648; // 0x80000000 } diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index fce715ade5af..d2c17556bb2f 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -16,6 +16,7 @@ package android.os; +import android.annotation.FlaggedApi; import android.Manifest.permission; import android.annotation.CallbackExecutor; import android.annotation.CurrentTimeMillisLong; @@ -1940,6 +1941,7 @@ public final class PowerManager { * * @hide */ + @FlaggedApi(android.os.Flags.FLAG_BATTERY_SAVER_SUPPORTED_CHECK_API) @TestApi public boolean isBatterySaverSupported() { try { diff --git a/core/java/android/os/flags.aconfig b/core/java/android/os/flags.aconfig index 10b9e3a15834..86f03cd1dbfc 100644 --- a/core/java/android/os/flags.aconfig +++ b/core/java/android/os/flags.aconfig @@ -41,3 +41,10 @@ flag { description: "Guards the ADPF power efficiency API" bug: "288117936" } + +flag { + name: "battery_saver_supported_check_api" + namespace: "backstage_power" + description: "Guards a new API in PowerManager to check if battery saver is supported or not." + bug: "305067031" +}
\ No newline at end of file |