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

Commit 2ed5c9c1 authored by Jack Wu's avatar Jack Wu
Browse files

BatteryMonitor: fix build error with health hal v2 updraged 



libbatterymonitor_V1 is used for some libraries linking health
aidl_interface V1 but at the same time BatteryMonitor also uses
battery hal V2 structure, it will cause compiling error.

Folk BatteryMonitor is also required along with folk libbatterymonitor

Bug: 251425963
Test: build
Change-Id: I796db83b1a67ad63e7f75f966e829a790b5c9c89
Signed-off-by: default avatarJack Wu <wjack@google.com>
parent 0635794d

healthd/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ package { 


cc_defaults {

    name: "libbatterymonitor_defaults",

    srcs: ["BatteryMonitor.cpp"],

    cflags: ["-Wall", "-Werror"],

    vendor_available: true,

    recovery_available: true,
@@ -75,6 +74,7 @@ cc_library_headers { 
cc_library_static {

    name: "libbatterymonitor",

    defaults: ["libbatterymonitor_defaults"],

    srcs: ["BatteryMonitor.cpp"],

    static_libs: [

        "android.hardware.health-V2-ndk",

    ],
@@ -89,6 +89,7 @@ cc_library_static { 
cc_library_static {

    name: "libbatterymonitor-V1",

    defaults: ["libbatterymonitor_defaults"],

    srcs: ["BatteryMonitor_v1.cpp"],

    static_libs: [

        "android.hardware.health-V1-ndk",

    ],

healthd/BatteryMonitor_v1.cpp

0 → 100644
+822 −0

File added.

Preview size limit exceeded, changes collapsed.

healthd/include/healthd/BatteryMonitor_v1.h

0 → 100644
+89 −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 HEALTHD_BATTERYMONITOR_V1_H

#define HEALTHD_BATTERYMONITOR_V1_H



#include <memory>



#include <batteryservice/BatteryService.h>

#include <utils/String8.h>

#include <utils/Vector.h>



#include <healthd/healthd.h>



namespace aidl::android::hardware::health {

class HealthInfo;

}  // namespace aidl::android::hardware::health



namespace android {

namespace hardware {

namespace health {

namespace V1_0 {

struct HealthInfo;

}  // namespace V1_0

namespace V2_0 {

struct HealthInfo;

}  // namespace V2_0

namespace V2_1 {

struct HealthInfo;

}  // namespace V2_1

}  // namespace health

}  // namespace hardware



class BatteryMonitor {

  public:



    enum PowerSupplyType {

        ANDROID_POWER_SUPPLY_TYPE_UNKNOWN = 0,

        ANDROID_POWER_SUPPLY_TYPE_AC,

        ANDROID_POWER_SUPPLY_TYPE_USB,

        ANDROID_POWER_SUPPLY_TYPE_WIRELESS,

        ANDROID_POWER_SUPPLY_TYPE_BATTERY,

        ANDROID_POWER_SUPPLY_TYPE_DOCK

    };



    BatteryMonitor();

    ~BatteryMonitor();

    void init(struct healthd_config *hc);

    int getChargeStatus();

    status_t getProperty(int id, struct BatteryProperty *val);

    void dumpState(int fd);



    android::hardware::health::V1_0::HealthInfo getHealthInfo_1_0() const;

    android::hardware::health::V2_0::HealthInfo getHealthInfo_2_0() const;

    android::hardware::health::V2_1::HealthInfo getHealthInfo_2_1() const;

    const aidl::android::hardware::health::HealthInfo& getHealthInfo() const;



    void updateValues(void);

    void logValues(void);

    bool isChargerOnline();



    static void logValues(const android::hardware::health::V2_1::HealthInfo& health_info,

                          const struct healthd_config& healthd_config);



  private:

    struct healthd_config *mHealthdConfig;

    Vector<String8> mChargerNames;

    bool mBatteryDevicePresent;

    int mBatteryFixedCapacity;

    int mBatteryFixedTemperature;

    std::unique_ptr<aidl::android::hardware::health::HealthInfo> mHealthInfo;

};



}; // namespace android



#endif // HEALTHD_BATTERYMONITOR_V1_H