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

Commit 2d2348e7 authored by Yifan Hong's avatar Yifan Hong Committed by Android (Google) Code Review
Browse files

Merge "IBatteryPropertiesRegistrar: remove unused functions"

parents 65fd8bf2 dd0e9425

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -215,7 +215,6 @@ java_library { 
        "core/java/android/se/omapi/ISecureElementChannel.aidl",

        "core/java/android/se/omapi/ISecureElementReader.aidl",

        "core/java/android/se/omapi/ISecureElementSession.aidl",

        "core/java/android/os/IBatteryPropertiesListener.aidl",

        "core/java/android/os/IBatteryPropertiesRegistrar.aidl",

        "core/java/android/os/ICancellationSignal.aidl",

        "core/java/android/os/IDeviceIdentifiersPolicyService.aidl",

core/java/android/os/BatteryProperties.aidl

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
/*

** Copyright 2013, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/



package android.os;



parcelable BatteryProperties;

core/java/android/os/BatteryProperties.java

deleted100644 → 0
+0 −110
Original line number Diff line number Diff line 
/* Copyright 2013, The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

*/



package android.os;



/**

 * {@hide}

 */

public class BatteryProperties implements Parcelable {

    public boolean chargerAcOnline;

    public boolean chargerUsbOnline;

    public boolean chargerWirelessOnline;

    public int maxChargingCurrent;

    public int maxChargingVoltage;

    public int batteryStatus;

    public int batteryHealth;

    public boolean batteryPresent;

    public int batteryLevel;

    public int batteryVoltage;

    public int batteryTemperature;

    public int batteryFullCharge;

    public int batteryChargeCounter;

    public String batteryTechnology;



    public BatteryProperties() {

    }



    public void set(BatteryProperties other) {

        chargerAcOnline = other.chargerAcOnline;

        chargerUsbOnline = other.chargerUsbOnline;

        chargerWirelessOnline = other.chargerWirelessOnline;

        maxChargingCurrent = other.maxChargingCurrent;

        maxChargingVoltage = other.maxChargingVoltage;

        batteryStatus = other.batteryStatus;

        batteryHealth = other.batteryHealth;

        batteryPresent = other.batteryPresent;

        batteryLevel = other.batteryLevel;

        batteryVoltage = other.batteryVoltage;

        batteryTemperature = other.batteryTemperature;

        batteryFullCharge = other.batteryFullCharge;

        batteryChargeCounter = other.batteryChargeCounter;

        batteryTechnology = other.batteryTechnology;

    }



    /*

     * Parcel read/write code must be kept in sync with

     * frameworks/native/services/batteryservice/BatteryProperties.cpp

     */



    private BatteryProperties(Parcel p) {

        chargerAcOnline = p.readInt() == 1 ? true : false;

        chargerUsbOnline = p.readInt() == 1 ? true : false;

        chargerWirelessOnline = p.readInt() == 1 ? true : false;

        maxChargingCurrent = p.readInt();

        maxChargingVoltage = p.readInt();

        batteryStatus = p.readInt();

        batteryHealth = p.readInt();

        batteryPresent = p.readInt() == 1 ? true : false;

        batteryLevel = p.readInt();

        batteryVoltage = p.readInt();

        batteryTemperature = p.readInt();

        batteryFullCharge = p.readInt();

        batteryChargeCounter = p.readInt();

        batteryTechnology = p.readString();

    }



    public void writeToParcel(Parcel p, int flags) {

        p.writeInt(chargerAcOnline ? 1 : 0);

        p.writeInt(chargerUsbOnline ? 1 : 0);

        p.writeInt(chargerWirelessOnline ? 1 : 0);

        p.writeInt(maxChargingCurrent);

        p.writeInt(maxChargingVoltage);

        p.writeInt(batteryStatus);

        p.writeInt(batteryHealth);

        p.writeInt(batteryPresent ? 1 : 0);

        p.writeInt(batteryLevel);

        p.writeInt(batteryVoltage);

        p.writeInt(batteryTemperature);

        p.writeInt(batteryFullCharge);

        p.writeInt(batteryChargeCounter);

        p.writeString(batteryTechnology);

    }



    public static final Parcelable.Creator<BatteryProperties> CREATOR

        = new Parcelable.Creator<BatteryProperties>() {

        public BatteryProperties createFromParcel(Parcel p) {

            return new BatteryProperties(p);

        }



        public BatteryProperties[] newArray(int size) {

            return new BatteryProperties[size];

        }

    };



    public int describeContents() {

        return 0;

    }

}

core/java/android/os/IBatteryPropertiesListener.aidl

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
/*

** Copyright 2013, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/



package android.os;



import android.os.BatteryProperties;



/**

 * {@hide}

 */



oneway interface IBatteryPropertiesListener {

    void batteryPropertiesChanged(in BatteryProperties props);

}

core/java/android/os/IBatteryPropertiesRegistrar.aidl

+0 −3
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package android.os;



import android.os.IBatteryPropertiesListener;

import android.os.BatteryProperty;



/**
@@ -24,8 +23,6 @@ import android.os.BatteryProperty; 
 */



interface IBatteryPropertiesRegistrar {

    void registerListener(IBatteryPropertiesListener listener);

    void unregisterListener(IBatteryPropertiesListener listener);

    int getProperty(in int id, out BatteryProperty prop);

    oneway void scheduleUpdate();

}