commit e593aaa350f80296127f3e1231ca6e5e1c0baa9d
author chungkai <chungkai@google.com> Wed Apr 06 10:11:12 2022 +0000
committer Chung-Kai (Michael) Mei <chungkai@google.com> Fri Apr 08 02:09:58 2022 +0000
tree 8103874e6c1087e37b6977f2f6a83b8409463364
parent a8eb458e82b4139b156629aeb26e4a6f20bad69a

fix path for i2c peripheral device

paths are changed when we enable parallel module loading and
reorder the initializtaion of devices.

Test: without avc denial on B3 when booting
Bug: 227541760
Signed-off-by: chungkai <chungkai@google.com>
Change-Id: Ibc9f9138d5becc26d9fbf0c2df43e55dddd40a97

powerstats/slider/service.cpp

diff --git a/powerstats/slider/service.cpp b/powerstats/slider/service.cpp
index 5fe5332..6969cc0 100644
--- a/powerstats/slider/service.cpp
+++ b/powerstats/slider/service.cpp
@@ -26,6 +26,7 @@
 #include <android/binder_manager.h>
 #include <android/binder_process.h>
 #include <log/log.h>
+#include <sys/stat.h>
 
 using aidl::android::hardware::power::stats::DisplayStateResidencyDataProvider;
 using aidl::android::hardware::power::stats::EnergyConsumerType;
@@ -58,6 +59,8 @@
 }
 
 int main() {
+    struct stat buffer;
+
     LOG(INFO) << "Pixel PowerStats HAL AIDL Service is starting.";
 
     // single thread
@@ -67,7 +70,19 @@
 
     addGs101CommonDataProviders(p);
     addDisplay(p);
-
+    if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-3/i2c-st21nfc/power_stats", &buffer)) {
+        addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-3/i2c-st21nfc/power_stats");
+    } else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-4/i2c-st21nfc/power_stats", &buffer)) {
+        addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-4/i2c-st21nfc/power_stats");
+    } else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-5/i2c-st21nfc/power_stats", &buffer)) {
+        addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-5/i2c-st21nfc/power_stats");
+    } else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-6/i2c-st21nfc/power_stats", &buffer)) {
+        addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-6/i2c-st21nfc/power_stats");
+    } else if (!stat("/sys/devices/platform/10960000.hsi2c/i2c-7/i2c-st21nfc/power_stats", &buffer)) {
+        addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-7/i2c-st21nfc/power_stats");
+    } else {
+        addNFC(p, "/sys/devices/platform/10960000.hsi2c/i2c-8/i2c-st21nfc/power_stats");
+    }
     const std::string instance = std::string() + PowerStats::descriptor + "/default";
     binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str());
     LOG_ALWAYS_FATAL_IF(status != STATUS_OK);