diff options
| author | 2023-11-01 01:07:41 +0000 | |
|---|---|---|
| committer | 2023-11-01 01:07:41 +0000 | |
| commit | d5d3d8c75e7378fb33fcc17570e746b671dd0400 (patch) | |
| tree | 62b9ab8391be198dd551135f54b899ae77e18c9f | |
| parent | eaa0f6ce799f9d2093a95a3ec0ebac4bb88317e3 (diff) | |
| parent | cdf207b2b6b78dc0ef93b1999207be0078c2dcc5 (diff) | |
Merge "Suppress "UnflaggedApi" lint for @TestApi." into main am: cdf207b2b6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2813073
Change-Id: Icb810473ad7c6635a906439ddca1a861e5a8376d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/os/BatteryManager.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/os/BatteryManager.java b/core/java/android/os/BatteryManager.java index 6a4ec9b7605a..25fba60b9bb5 100644 --- a/core/java/android/os/BatteryManager.java +++ b/core/java/android/os/BatteryManager.java @@ -21,6 +21,7 @@ import static android.os.Flags.FLAG_STATE_OF_HEALTH_PUBLIC; import android.Manifest.permission; import android.annotation.FlaggedApi; import android.annotation.RequiresPermission; +import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.annotation.SystemService; import android.annotation.TestApi; @@ -236,6 +237,7 @@ public class BatteryManager { OsProtoEnums.CHARGING_POLICY_ADAPTIVE_LONGLIFE; // = 4 /** @hide */ + @SuppressLint("UnflaggedApi") // TestApi without associated feature. @TestApi public static final int BATTERY_PLUGGED_ANY = BATTERY_PLUGGED_AC | BATTERY_PLUGGED_USB | BATTERY_PLUGGED_WIRELESS |