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

Commit 87bf0d97 authored by Todd Poynor's avatar Todd Poynor
Browse files

add libbatteryservice 

IBatteryPropertiesListener is used by clients such as BatteryService to
receive notifications of changed battery/power status (from healthd).

IBatteryPropertiesRegistrar manages registrations of
IBatteryPropertiesListener clients.

Add BatteryService native header with defines from BatteryManager, and
class BatteryProperties to pass battery/power status around.

Change-Id: I44e2736e503b586794097b7b9d31d07fefd9b15a
parent a7b0f04a

include/batteryservice/BatteryService.h

0 → 100644
+64 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 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.

 */



#ifndef ANDROID_BATTERYSERVICE_H

#define ANDROID_BATTERYSERVICE_H



#include <binder/Parcel.h>

#include <utils/Errors.h>

#include <utils/String8.h>



namespace android {



// must be kept in sync with definitions in BatteryManager.java

enum {

    BATTERY_STATUS_UNKNOWN = 1, // equals BatteryManager.BATTERY_STATUS_UNKNOWN constant

    BATTERY_STATUS_CHARGING = 2, // equals BatteryManager.BATTERY_STATUS_CHARGING constant

    BATTERY_STATUS_DISCHARGING = 3, // equals BatteryManager.BATTERY_STATUS_DISCHARGING constant

    BATTERY_STATUS_NOT_CHARGING = 4, // equals BatteryManager.BATTERY_STATUS_NOT_CHARGING constant

    BATTERY_STATUS_FULL = 5, // equals BatteryManager.BATTERY_STATUS_FULL constant

};



// must be kept in sync with definitions in BatteryManager.java

enum {

    BATTERY_HEALTH_UNKNOWN = 1, // equals BatteryManager.BATTERY_HEALTH_UNKNOWN constant

    BATTERY_HEALTH_GOOD = 2, // equals BatteryManager.BATTERY_HEALTH_GOOD constant

    BATTERY_HEALTH_OVERHEAT = 3, // equals BatteryManager.BATTERY_HEALTH_OVERHEAT constant

    BATTERY_HEALTH_DEAD = 4, // equals BatteryManager.BATTERY_HEALTH_DEAD constant

    BATTERY_HEALTH_OVER_VOLTAGE = 5, // equals BatteryManager.BATTERY_HEALTH_OVER_VOLTAGE constant

    BATTERY_HEALTH_UNSPECIFIED_FAILURE = 6, // equals BatteryManager.BATTERY_HEALTH_UNSPECIFIED_FAILURE constant

    BATTERY_HEALTH_COLD = 7, // equals BatteryManager.BATTERY_HEALTH_COLD constant

};



struct BatteryProperties {

    bool chargerAcOnline;

    bool chargerUsbOnline;

    bool chargerWirelessOnline;

    int batteryStatus;

    int batteryHealth;

    bool batteryPresent;

    int batteryLevel;

    int batteryVoltage;

    int batteryTemperature;

    String8 batteryTechnology;



    status_t writeToParcel(Parcel* parcel) const;

    status_t readFromParcel(Parcel* parcel);

};



}; // namespace android



#endif // ANDROID_BATTERYSERVICE_H

include/batteryservice/IBatteryPropertiesListener.h

0 → 100644
+45 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 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.

 */



#ifndef ANDROID_IBATTERYPROPERTIESLISTENER_H

#define ANDROID_IBATTERYPROPERTIESLISTENER_H



#include <binder/IBinder.h>

#include <binder/IInterface.h>



#include <batteryservice/BatteryService.h>



namespace android {



// must be kept in sync with interface defined in IBatteryPropertiesListener.aidl

enum {

        TRANSACT_BATTERYPROPERTIESCHANGED = IBinder::FIRST_CALL_TRANSACTION,

};



// ----------------------------------------------------------------------------



class IBatteryPropertiesListener : public IInterface {

public:

    DECLARE_META_INTERFACE(BatteryPropertiesListener);



    virtual void batteryPropertiesChanged(struct BatteryProperties props) = 0;

};



// ----------------------------------------------------------------------------



}; // namespace android



#endif // ANDROID_IBATTERYPROPERTIESLISTENER_H

include/batteryservice/IBatteryPropertiesRegistrar.h

0 → 100644
+47 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 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.

 */



#ifndef ANDROID_IBATTERYPROPERTIESREGISTRAR_H

#define ANDROID_IBATTERYPROPERTIESREGISTRAR_H



#include <binder/IInterface.h>

#include <batteryservice/IBatteryPropertiesListener.h>



namespace android {



// must be kept in sync with interface defined in IBatteryPropertiesRegistrar.aidl

enum {

    REGISTER_LISTENER = IBinder::FIRST_CALL_TRANSACTION,

    UNREGISTER_LISTENER,

};



class IBatteryPropertiesRegistrar : public IInterface {

public:

    DECLARE_META_INTERFACE(BatteryPropertiesRegistrar);



    virtual void registerListener(const sp<IBatteryPropertiesListener>& listener) = 0;

    virtual void unregisterListener(const sp<IBatteryPropertiesListener>& listener) = 0;

};



class BnBatteryPropertiesRegistrar : public BnInterface<IBatteryPropertiesRegistrar> {

public:

    virtual status_t onTransact(uint32_t code, const Parcel& data,

                                Parcel* reply, uint32_t flags = 0);

};



}; // namespace android



#endif // ANDROID_IBATTERYPROPERTIESREGISTRAR_H

services/batteryservice/Android.mk

0 → 100644
+17 −0
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \

	BatteryProperties.cpp \

	IBatteryPropertiesListener.cpp \

	IBatteryPropertiesRegistrar.cpp



LOCAL_STATIC_LIBRARIES := \

	libutils \

	libbinder



LOCAL_MODULE:= libbatteryservice



LOCAL_MODULE_TAGS := optional



include $(BUILD_STATIC_LIBRARY)

services/batteryservice/BatteryProperties.cpp

0 → 100644
+60 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 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.

 */



#include <stdint.h>

#include <sys/types.h>

#include <batteryservice/BatteryService.h>

#include <binder/Parcel.h>

#include <utils/Errors.h>

#include <utils/String8.h>

#include <utils/String16.h>



namespace android {



/*

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

 * frameworks/base/core/java/android/os/BatteryProperties.java

 */



status_t BatteryProperties::readFromParcel(Parcel* p) {

    chargerAcOnline = p->readInt32() == 1 ? true : false;

    chargerUsbOnline = p->readInt32() == 1 ? true : false;

    chargerWirelessOnline = p->readInt32() == 1 ? true : false;

    batteryStatus = p->readInt32();

    batteryHealth = p->readInt32();

    batteryPresent = p->readInt32() == 1 ? true : false;

    batteryLevel = p->readInt32();

    batteryVoltage = p->readInt32();

    batteryTemperature = p->readInt32();

    batteryTechnology = String8((p->readString16()).string());

    return OK;

}



status_t BatteryProperties::writeToParcel(Parcel* p) const {

    p->writeInt32(chargerAcOnline ? 1 : 0);

    p->writeInt32(chargerUsbOnline ? 1 : 0);

    p->writeInt32(chargerWirelessOnline ? 1 : 0);

    p->writeInt32(batteryStatus);

    p->writeInt32(batteryHealth);

    p->writeInt32(batteryPresent ? 1 : 0);

    p->writeInt32(batteryLevel);

    p->writeInt32(batteryVoltage);

    p->writeInt32(batteryTemperature);

    p->writeString16(String16(batteryTechnology));

    return OK;

}



}; // namespace android