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

Commit c9b9464a authored by Chris Ye's avatar Chris Ye
Browse files

Rename Battery to BatteryState. 

Rename Battery to BatteryState, and rename the method hasBattery to
isPresent.
Return NaN in getCapacity() if capacity can not be read.

Bug: 180733860
Test: atest android.hardware.input.cts.tests

Change-Id: I8e855be0b263479c2744b817df5f591c9d1e4a64
parent 1700fa9e

core/api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -17137,11 +17137,11 @@ package android.graphics.text { 














package android.hardware {



























  public abstract class Battery {













    ctor public Battery();













  public abstract class BatteryState {













    ctor public BatteryState();















    method @FloatRange(from=-1.0F, to=1.0f) public abstract float getCapacity();















    method public abstract int getStatus();













    method public abstract boolean hasBattery();













    method public abstract boolean isPresent();















    field public static final int STATUS_CHARGING = 2; // 0x2















    field public static final int STATUS_DISCHARGING = 3; // 0x3















    field public static final int STATUS_FULL = 5; // 0x5










@@ -47132,7 +47132,7 @@ package android.view {



























  public final class InputDevice implements android.os.Parcelable {















    method public int describeContents();













    method @NonNull public android.hardware.Battery getBattery();













    method @NonNull public android.hardware.BatteryState getBatteryState();















    method public int getControllerNumber();















    method public String getDescriptor();















    method public static android.view.InputDevice getDevice(int);

























core/java/android/hardware/Battery.java→core/java/android/hardware/BatteryState.java



+4
−4




























Original line number
Diff line number
Diff line








@@ -24,9 +24,9 @@ import java.lang.annotation.Retention;













import java.lang.annotation.RetentionPolicy;































/**













 * The Battery class is a representation of a single battery on a device.













 * The BatteryState class is a representation of a single battery on a device.















 */













public abstract class Battery {













public abstract class BatteryState {















    /** @hide */















    @Retention(RetentionPolicy.SOURCE)















    @IntDef(prefix = { "STATUS_" }, value = {










@@ -55,7 +55,7 @@ public abstract class Battery {













     *















     * @return True if the hardware has a battery, else false.















     */













    public abstract boolean hasBattery();













    public abstract boolean isPresent();































    /**















     * Get the battery status.









@@ -66,7 +66,7 @@ public abstract class Battery {





























    /**















     * Get remaining battery capacity as float percentage [0.0f, 1.0f] of total capacity













     * Returns -1 when battery capacity can't be read.













     * Returns NaN when battery capacity can't be read.















     *















     * @return the battery capacity.















     */

































core/java/android/hardware/input/InputDeviceBattery.java→core/java/android/hardware/input/InputDeviceBatteryState.java



+5
−5




























Original line number
Diff line number
Diff line








@@ -19,28 +19,28 @@ package android.hardware.input;













import static android.os.BatteryManager.BATTERY_STATUS_UNKNOWN;















import static android.os.IInputConstants.INVALID_BATTERY_CAPACITY;





























import android.hardware.Battery;













import android.hardware.BatteryState;































/**















 * Battery implementation for input devices.















 *















 * @hide















 */













public final class InputDeviceBattery extends Battery {













    private static final float NULL_BATTERY_CAPACITY = -1.0f;













public final class InputDeviceBatteryState extends BatteryState {













    private static final float NULL_BATTERY_CAPACITY = Float.NaN;































    private final InputManager mInputManager;















    private final int mDeviceId;















    private final boolean mHasBattery;





























    InputDeviceBattery(InputManager inputManager, int deviceId, boolean hasBattery) {













    InputDeviceBatteryState(InputManager inputManager, int deviceId, boolean hasBattery) {















        mInputManager = inputManager;















        mDeviceId = deviceId;















        mHasBattery = hasBattery;















    }































    @Override













    public boolean hasBattery() {













    public boolean isPresent() {















        return mHasBattery;















    }

















































core/java/android/hardware/input/InputManager.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -1571,12 +1571,12 @@ public final class InputManager {













    }































    /**













     * Gets a battery object associated with an input device, assuming it has one.













     * Gets a battery state object associated with an input device, assuming it has one.















     * @return The battery, never null.















     * @hide















     */













    public InputDeviceBattery getInputDeviceBattery(int deviceId, boolean hasBattery) {













        return new InputDeviceBattery(this, deviceId, hasBattery);













    public InputDeviceBatteryState getInputDeviceBatteryState(int deviceId, boolean hasBattery) {













        return new InputDeviceBatteryState(this, deviceId, hasBattery);















    }































    /**

































core/java/android/hardware/lights/Light.java



+5
−0




























Original line number
Diff line number
Diff line








@@ -141,6 +141,11 @@ public final class Light implements Parcelable {













        return mId;















    }





























    @Override













    public String toString() {













        return "[Name=" + mName + " Id=" + mId + " Type=" + mType + " Ordinal=" + mOrdinal + "]";













    }





























    /**















     * Returns the id of the light.















     *