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

Merge "Fix issue #67019445: Detect BATTERY_LOW/OKAY"

Browse Source
This commit is contained in:
Dianne Hackborn
2017-11-22 18:27:59 +00:00
committed by Android (Google) Code Review
parent 3daba14f25 74ed6ecdc4
commit 1edf09c99b
5 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -30838,6 +30838,7 @@ package android.os {
field public static final int BATTERY_STATUS_FULL = 5; // 0x5
field public static final int BATTERY_STATUS_NOT_CHARGING = 4; // 0x4
field public static final int BATTERY_STATUS_UNKNOWN = 1; // 0x1
field public static final java.lang.String EXTRA_BATTERY_LOW = "battery_low";
field public static final java.lang.String EXTRA_HEALTH = "health";
field public static final java.lang.String EXTRA_ICON_SMALL = "icon-small";
field public static final java.lang.String EXTRA_LEVEL = "level";

1
api/system-current.txt
View File

@@ -33570,6 +33570,7 @@ package android.os {
field public static final int BATTERY_STATUS_FULL = 5; // 0x5
field public static final int BATTERY_STATUS_NOT_CHARGING = 4; // 0x4
field public static final int BATTERY_STATUS_UNKNOWN = 1; // 0x1
field public static final java.lang.String EXTRA_BATTERY_LOW = "battery_low";
field public static final java.lang.String EXTRA_HEALTH = "health";
field public static final java.lang.String EXTRA_ICON_SMALL = "icon-small";
field public static final java.lang.String EXTRA_LEVEL = "level";

1
api/test-current.txt
View File

@@ -31042,6 +31042,7 @@ package android.os {
field public static final int BATTERY_STATUS_FULL = 5; // 0x5
field public static final int BATTERY_STATUS_NOT_CHARGING = 4; // 0x4
field public static final int BATTERY_STATUS_UNKNOWN = 1; // 0x1
field public static final java.lang.String EXTRA_BATTERY_LOW = "battery_low";
field public static final java.lang.String EXTRA_HEALTH = "health";
field public static final java.lang.String EXTRA_ICON_SMALL = "icon-small";
field public static final java.lang.String EXTRA_LEVEL = "level";

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

@@ -18,6 +18,7 @@ package android.os;
import android.annotation.SystemService;
import android.content.Context;
import android.content.Intent;
import android.hardware.health.V1_0.Constants;
import com.android.internal.app.IBatteryStats;
@@ -54,6 +55,14 @@ public class BatteryManager {
*/
public static final String EXTRA_LEVEL = "level";
/**
* Extra for {@link android.content.Intent#ACTION_BATTERY_CHANGED}:
* Boolean field indicating whether the battery is currently considered to be
* low, that is whether a {@link Intent#ACTION_BATTERY_LOW} broadcast
* has been sent.
*/
public static final String EXTRA_BATTERY_LOW = "battery_low";
/**
* Extra for {@link android.content.Intent#ACTION_BATTERY_CHANGED}:
* integer containing the maximum battery level.

1
services/core/java/com/android/server/BatteryService.java
View File

@@ -619,6 +619,7 @@ public final class BatteryService extends SystemService {
intent.putExtra(BatteryManager.EXTRA_HEALTH, mHealthInfo.batteryHealth);
intent.putExtra(BatteryManager.EXTRA_PRESENT, mHealthInfo.batteryPresent);
intent.putExtra(BatteryManager.EXTRA_LEVEL, mHealthInfo.batteryLevel);
intent.putExtra(BatteryManager.EXTRA_BATTERY_LOW, mSentLowBatteryBroadcast);
intent.putExtra(BatteryManager.EXTRA_SCALE, BATTERY_SCALE);
intent.putExtra(BatteryManager.EXTRA_ICON_SMALL, icon);
intent.putExtra(BatteryManager.EXTRA_PLUGGED, mPlugType);