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

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

Merge changes from topic "health_cleanup" into stage-aosp-master 

* changes:
  libbatteryservice_headers: export libutils_headers
  libbatteryservice: remove binder details
  Remove include/batteryservice
parents e87cc866 54091e90

include/batteryservice

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../services/batteryservice/include/batteryservice/
 
 No newline at end of file

services/batteryservice/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -2,6 +2,6 @@ cc_library_headers { 
    name: "libbatteryservice_headers",

    vendor_available: true,

    export_include_dirs: ["include"],

    header_libs: ["libbinder_headers"],

    export_header_lib_headers: ["libbinder_headers"],

    header_libs: ["libutils_headers"],

    export_header_lib_headers: ["libutils_headers"],

}

services/batteryservice/include/batteryservice/BatteryService.h

+0 −7
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#ifndef ANDROID_BATTERYSERVICE_H

#define ANDROID_BATTERYSERVICE_H



#include <binder/Parcel.h>

#include <sys/types.h>

#include <utils/Errors.h>

#include <utils/String8.h>
@@ -54,16 +53,10 @@ struct BatteryProperties { 
    int batteryFullCharge;

    int batteryChargeCounter;

    String8 batteryTechnology;



    status_t writeToParcel(Parcel* parcel) const;

    status_t readFromParcel(Parcel* parcel);

};



struct BatteryProperty {

    int64_t valueInt64;



    status_t writeToParcel(Parcel* parcel) const;

    status_t readFromParcel(Parcel* parcel);

};



}; // namespace android

services/batteryservice/include/batteryservice/IBatteryPropertiesListener.h

deleted100644 → 0
+0 −51
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;

};



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



class BnBatteryPropertiesListener: public BnInterface<IBatteryPropertiesListener> {

public:

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

                                Parcel* reply, uint32_t flags = 0);

};



}; // namespace android



#endif // ANDROID_IBATTERYPROPERTIESLISTENER_H

services/batteryservice/include/batteryservice/IBatteryPropertiesRegistrar.h

deleted100644 → 0
+0 −51
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,

    GET_PROPERTY,

    SCHEDULE_UPDATE,

};



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;

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

    virtual void scheduleUpdate() = 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