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

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

Merge "Add BATTERY_PLUGGED_ANY constant to @TestApis." am: 0f3698d8 am:... 

Merge "Add BATTERY_PLUGGED_ANY constant to @TestApis." am: 0f3698d8 am: 36c8bc24 am: f806c378 am: 8c6a9b28

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



Change-Id: Iba07896813f33a7a9127944235f62765991acb09
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a75cf97d 8c6a9b28

core/api/test-current.txt

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

core/java/android/os/BatteryManager.java

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