Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5d3d8c7 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

Merge "Suppress "UnflaggedApi" lint for @TestApi." into main am: cdf207b2 

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



Change-Id: Icb810473ad7c6635a906439ddca1a861e5a8376d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eaa0f6ce cdf207b2

core/java/android/os/BatteryManager.java

+2 −0
Original line number Diff line number Diff line
@@ -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