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

Merge "Add BATTERY_PLUGGED_ANY constant to @TestApis." am: 0f3698d8c4 am: 36c8bc2451 am: f806c378b5

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

Change-Id: Ic9d3c9dc438d52dd7ccad8dccff564cfce016ffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sudheer Shanka
2023-06-01 21:55:08 +00:00
committed by Automerger Merge Worker
parent ffd2053170 f806c378b5
commit 8c6a9b28a7
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/test-current.txt
View File

@@ -2167,6 +2167,10 @@ package android.net.wifi.sharedconnectivity.service {
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);

2
core/java/android/os/BatteryManager.java
View File

@@ -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;