commit 36607ad09fc13e25ea80560cfda233b1801d353e
author Wei Wang <wvw@google.com> Sat Oct 27 20:54:21 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Oct 27 20:54:21 2018 +0000
tree 3037db01135bc5a238863035ca6eaa0c38c6c6ec
parent 9d859ebfe45081735af72b1372ac36b97a103e4c
parent 01065acda7d0b58498e1cbd4cc8ec0c23740e087

Merge "Rename callback to reflect HAL version"

services/thermalservice/thermalserviced.cpp

diff --git a/services/thermalservice/thermalserviced.cpp b/services/thermalservice/thermalserviced.cpp
index 7826a76..0bfaaff 100644
--- a/services/thermalservice/thermalserviced.cpp
+++ b/services/thermalservice/thermalserviced.cpp
@@ -73,10 +73,10 @@
     mThermalService = new android::os::ThermalService;
     mThermalService->publish(mThermalService);
     // Register IThermalService object to ThermalHAL callback
-    if (mThermalChangedCallback != nullptr) {
-        mThermalChangedCallback->registerThermalService(mThermalService);
-    } else if (mThermalCallback != nullptr) {
-        mThermalCallback->registerThermalService(mThermalService);
+    if (mThermalCallback_2_0 != nullptr) {
+        mThermalCallback_2_0->registerThermalService(mThermalService);
+    } else if (mThermalCallback_1_1 != nullptr) {
+        mThermalCallback_1_1->registerThermalService(mThermalService);
     }
     IPCThreadState::self()->joinThreadPool();
 }
@@ -103,8 +103,8 @@
             gThermalHal1_1->linkToDeath(gThermalHalDied, 0x451F /* cookie */);
         }
 
-        if (mThermalCallback != nullptr) {
-            Return<void> ret = gThermalHal1_1->registerThermalCallback(mThermalCallback);
+        if (mThermalCallback_1_1 != nullptr) {
+            Return<void> ret = gThermalHal1_1->registerThermalCallback(mThermalCallback_1_1);
             if (!ret.isOk()) {
                 SLOGE("registerThermalCallback failed, status: %s", ret.description().c_str());
             }
@@ -114,10 +114,10 @@
             gThermalHal2_0->linkToDeath(gThermalHalDied, 0x451F /* cookie */);
         }
 
-        if (mThermalCallback != nullptr) {
+        if (mThermalCallback_2_0 != nullptr) {
             Return<void> ret =
                     gThermalHal2_0
-                            ->registerThermalChangedCallback(mThermalChangedCallback, false,
+                            ->registerThermalChangedCallback(mThermalCallback_2_0, false,
                                                              TemperatureType::SKIN, // not used
                                                              [](ThermalStatus status) {
                                                                  if (ThermalStatusCode::SUCCESS !=
@@ -138,11 +138,11 @@
 }
 
 ThermalServiceDaemon::~ThermalServiceDaemon() {
-    if (mThermalCallback != nullptr && gThermalHal2_0 != nullptr) {
+    if (mThermalCallback_2_0 != nullptr && gThermalHal2_0 != nullptr) {
         Return<void> ret =
                 gThermalHal2_0
                         ->unregisterThermalChangedCallback(
-                            mThermalChangedCallback,
+                            mThermalCallback_2_0,
                             [](ThermalStatus status) {
                                 if (ThermalStatusCode::SUCCESS !=
                                     status.code) {
@@ -163,8 +163,8 @@
     // to come back on the binder death notification thread and we need
     // another thread for the incoming service now available call.
     configureRpcThreadpool(2, false /* callerWillJoin */);
-    mThermalCallback = new ThermalCallback();
-    mThermalChangedCallback = new ThermalChangedCallback();
+    mThermalCallback_1_1 = new ThermalCallback();
+    mThermalCallback_2_0 = new ThermalChangedCallback();
     // Lookup Thermal HAL 1.1 and 2.0 to register our Callback.
     getThermalHal();
 }

services/thermalservice/thermalserviced.h

diff --git a/services/thermalservice/thermalserviced.h b/services/thermalservice/thermalserviced.h
index c6575f3..ff7a483 100644
--- a/services/thermalservice/thermalserviced.h
+++ b/services/thermalservice/thermalserviced.h
@@ -37,8 +37,8 @@
 
  private:
     sp<ThermalService> mThermalService;
-    sp<ThermalCallback> mThermalCallback;
-    sp<ThermalChangedCallback> mThermalChangedCallback;
+    sp<ThermalCallback> mThermalCallback_1_1;
+    sp<ThermalChangedCallback> mThermalCallback_2_0;
 };
 
 #endif  // ANDROID_THERMALSERVICE_THERMALSERVICED_H