From 01daaa0a6d9596646722be359f6a5343a683cc0c Mon Sep 17 00:00:00 2001
From: Francescodario Cuzzocrea <bosconovic@gmail.com>
Date: Wed, 15 Jul 2020 19:59:28 +0200
Subject: [PATCH] hidl:thermal: Rebrand to Samsung

Change-Id: I9119f21538c99143a5d0ec810ec1a0a7b43cacc9
---
 hidl/thermal/Android.bp                                     | 6 +++---
 ...l.rc => android.hardware.thermal@2.0-service.samsung.rc} | 2 +-
 ...xml => android.hardware.thermal@2.0-service.samsung.xml} | 0
 hidl/thermal/service.cpp                                    | 6 +++---
 hidl/thermal/thermal-helper.cpp                             | 3 ++-
 5 files changed, 9 insertions(+), 8 deletions(-)
 rename hidl/thermal/{android.hardware.thermal@2.0-service.pixel.rc => android.hardware.thermal@2.0-service.samsung.rc} (86%)
 rename hidl/thermal/{android.hardware.thermal@2.0-service.pixel.xml => android.hardware.thermal@2.0-service.samsung.xml} (100%)

diff --git a/hidl/thermal/Android.bp b/hidl/thermal/Android.bp
index 60d1c700..d3cc1fc0 100644
--- a/hidl/thermal/Android.bp
+++ b/hidl/thermal/Android.bp
@@ -1,13 +1,13 @@
 cc_binary {
-  name: "android.hardware.thermal@2.0-service.pixel",
+  name: "android.hardware.thermal@2.0-service.samsung",
   defaults: [
     "hidl_defaults",
   ],
   vendor: true,
   relative_install_path: "hw",
-  vintf_fragments: ["android.hardware.thermal@2.0-service.pixel.xml"],
+  vintf_fragments: ["android.hardware.thermal@2.0-service.samsung.xml"],
   init_rc: [
-    "android.hardware.thermal@2.0-service.pixel.rc",
+    "android.hardware.thermal@2.0-service.samsung.rc",
   ],
   srcs: [
     "service.cpp",
diff --git a/hidl/thermal/android.hardware.thermal@2.0-service.pixel.rc b/hidl/thermal/android.hardware.thermal@2.0-service.samsung.rc
similarity index 86%
rename from hidl/thermal/android.hardware.thermal@2.0-service.pixel.rc
rename to hidl/thermal/android.hardware.thermal@2.0-service.samsung.rc
index 27fc14a3..ddc91048 100644
--- a/hidl/thermal/android.hardware.thermal@2.0-service.pixel.rc
+++ b/hidl/thermal/android.hardware.thermal@2.0-service.samsung.rc
@@ -1,4 +1,4 @@
-service vendor.thermal-hal-2-0 /vendor/bin/hw/android.hardware.thermal@2.0-service.pixel
+service vendor.thermal-hal-2-0 /vendor/bin/hw/android.hardware.thermal@2.0-service.samsung
     interface android.hardware.thermal@2.0::IThermal default
     class hal
     user system
diff --git a/hidl/thermal/android.hardware.thermal@2.0-service.pixel.xml b/hidl/thermal/android.hardware.thermal@2.0-service.samsung.xml
similarity index 100%
rename from hidl/thermal/android.hardware.thermal@2.0-service.pixel.xml
rename to hidl/thermal/android.hardware.thermal@2.0-service.samsung.xml
diff --git a/hidl/thermal/service.cpp b/hidl/thermal/service.cpp
index 190269b7..8c79920a 100644
--- a/hidl/thermal/service.cpp
+++ b/hidl/thermal/service.cpp
@@ -29,7 +29,7 @@ using ::android::hardware::thermal::V2_0::IThermal;
 using ::android::hardware::thermal::V2_0::implementation::Thermal;
 
 static int shutdown() {
-    LOG(ERROR) << "Pixel Thermal HAL Service is shutting down.";
+    LOG(ERROR) << "Samsung Thermal HAL Service is shutting down.";
     return 1;
 }
 
@@ -37,7 +37,7 @@ int main(int /* argc */, char ** /* argv */) {
     status_t status;
     android::sp<IThermal> service = nullptr;
 
-    LOG(INFO) << "Pixel Thermal HAL Service 2.0 starting...";
+    LOG(INFO) << "Samsung Thermal HAL Service 2.0 starting...";
 
     service = new Thermal();
     if (service == nullptr) {
@@ -53,7 +53,7 @@ int main(int /* argc */, char ** /* argv */) {
         return shutdown();
     }
 
-    LOG(INFO) << "Pixel Thermal HAL Service 2.0 started successfully.";
+    LOG(INFO) << "Samsung Thermal HAL Service 2.0 started successfully.";
     joinRpcThreadpool();
     // We should not get past the joinRpcThreadpool().
     return shutdown();
diff --git a/hidl/thermal/thermal-helper.cpp b/hidl/thermal/thermal-helper.cpp
index 732d1817..dff45c29 100644
--- a/hidl/thermal/thermal-helper.cpp
+++ b/hidl/thermal/thermal-helper.cpp
@@ -56,7 +56,8 @@ namespace {
 using android::base::StringPrintf;
 
 /*
- * Pixel don't offline CPU, so std::thread::hardware_concurrency(); should work.
+ * The phone don't offline CPU, so std::thread::hardware_concurrency(); should
+ * work.
  * However /sys/devices/system/cpu/present is preferred.
  * The file is expected to contain single text line with two numbers %d-%d,
  * which is a range of available cpu numbers, e.g. 0-7 would mean there