From 5e1b258dd5beca122cef6dc2cb857bd559db9bc3 Mon Sep 17 00:00:00 2001
From: Sudheer Shanka <sudheersai@google.com>
Date: Tue, 30 May 2023 21:49:48 +0000
Subject: [PATCH] Add BATTERY_PLUGGED_ANY constant to @TestApis.

Bug: 284904539
Test: TH
Change-Id: Id3baefe9da3371cdfb0093bace7ca87cc6f29703
---
 core/api/test-current.txt                | 4 ++++
 core/java/android/os/BatteryManager.java | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/core/api/test-current.txt b/core/api/test-current.txt
index 6a5ef3a674886..cdfd1654baf43 100644
--- a/core/api/test-current.txt
+++ b/core/api/test-current.txt
@@ -1688,6 +1688,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 6bc0f6ea947cf..092923e927a3c 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;