openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "healthd: BatteryPropertiesRegistrar binder service ref count fixup" 

am: 36ba2fad01

* commit '36ba2fad014a1a0734a6e704e30677ee88640d3b':
  healthd: BatteryPropertiesRegistrar binder service ref count fixup
This commit is contained in:
Todd Poynor 2016-01-28 21:16:24 +00:00 committed by android-build-merger
parent e37103a375 36ba2fad01
commit 4a129d5a45
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
healthd/BatteryPropertiesRegistrar.cpp
View File

@ -30,8 +30,9 @@
namespace android {
void BatteryPropertiesRegistrar::publish() {
defaultServiceManager()->addService(String16("batteryproperties"), this);
void BatteryPropertiesRegistrar::publish(
const sp<BatteryPropertiesRegistrar>& service) {
defaultServiceManager()->addService(String16("batteryproperties"), service);
}
void BatteryPropertiesRegistrar::notifyListeners(struct BatteryProperties props) {

2
healthd/BatteryPropertiesRegistrar.h
View File

@ -30,7 +30,7 @@ namespace android {
class BatteryPropertiesRegistrar : public BnBatteryPropertiesRegistrar,
public IBinder::DeathRecipient {
public:
void publish();
void publish(const sp<BatteryPropertiesRegistrar>& service);
void notifyListeners(struct BatteryProperties props);
private:

2
healthd/healthd_mode_android.cpp
View File

@ -58,5 +58,5 @@ void healthd_mode_android_init(struct healthd_config* /*config*/) {
}
gBatteryPropertiesRegistrar = new BatteryPropertiesRegistrar();
gBatteryPropertiesRegistrar->publish();
gBatteryPropertiesRegistrar->publish(gBatteryPropertiesRegistrar);
}