diff --git a/universal7885-common/apps/aidl-support/fm/default/FMSupport.cpp b/universal7885-common/apps/aidl-support/fm/default/FMSupport.cpp index be2f4dd..ed621a4 100644 --- a/universal7885-common/apps/aidl-support/fm/default/FMSupport.cpp +++ b/universal7885-common/apps/aidl-support/fm/default/FMSupport.cpp @@ -38,7 +38,7 @@ constexpr const char *FM_FREQ_SEEK = FM_SYSFS_BASE "/radio_freq_seek"; } switch (type) { case GetType::GET_TYPE_FM_FREQ: - *_aidl_return = FileIO::readline(FM_FREQ_CTL); + *_aidl_return = FileIO::readint(FM_FREQ_CTL); break; case GetType::GET_TYPE_FM_UPPER_LIMIT: case GetType::GET_TYPE_FM_LOWER_LIMIT: @@ -109,7 +109,7 @@ constexpr const char *FM_FREQ_SEEK = FM_SYSFS_BASE "/radio_freq_seek"; for (int i = 0; i < TRACK_SIZE; i++) { FileIO::writeline(FM_FREQ_SEEK, "1 " + std::to_string(SYSFS_SPACING * 10)); - int freq = FileIO::readline(FM_FREQ_CTL); + int freq = FileIO::readint(FM_FREQ_CTL); if (std::find(freqs_list.begin(), freqs_list.end(), freq) != freqs_list.end()) continue; diff --git a/universal7885-common/apps/aidl-support/libfileio/FileIO.cpp b/universal7885-common/apps/aidl-support/libfileio/FileIO.cpp index 24414ef..4132db5 100644 --- a/universal7885-common/apps/aidl-support/libfileio/FileIO.cpp +++ b/universal7885-common/apps/aidl-support/libfileio/FileIO.cpp @@ -24,7 +24,7 @@ std::string readline(const char *path) { return value; } -int readline(const char *path) { +int readint(const char *path) { const std::string value = readline(path); try { return stoi(value); diff --git a/universal7885-common/apps/aidl-support/libfileio/include/FileIO.h b/universal7885-common/apps/aidl-support/libfileio/include/FileIO.h index 6b6bff3..44c6221 100644 --- a/universal7885-common/apps/aidl-support/libfileio/include/FileIO.h +++ b/universal7885-common/apps/aidl-support/libfileio/include/FileIO.h @@ -2,7 +2,7 @@ namespace FileIO { std::string readline(const char *path); - int readline(const char *path); + int readint(const char *path); void writeline(const char *path, const std::string& data); void writeline(const char *path, const int data); diff --git a/universal7885-common/apps/aidl-support/parts/default/Battery.cpp b/universal7885-common/apps/aidl-support/parts/default/Battery.cpp index 3c5fbed..985a1b8 100644 --- a/universal7885-common/apps/aidl-support/parts/default/Battery.cpp +++ b/universal7885-common/apps/aidl-support/parts/default/Battery.cpp @@ -43,7 +43,7 @@ static inline const char *BatterySysToPath(BatterySys type) { // Methods from ::android::hardware::battery::V1_0::IBattery follow. ::ndk::ScopedAStatus BatteryStats::getBatteryStats(BatterySys stats, int32_t *_aidl_return) { - *_aidl_return = FileIO::readline(BatterySysToPath(stats)); + *_aidl_return = FileIO::readint(BatterySysToPath(stats)); return ::ndk::ScopedAStatus::ok(); } diff --git a/universal7885-common/apps/aidl-support/parts/default/FlashLight.cpp b/universal7885-common/apps/aidl-support/parts/default/FlashLight.cpp index 3d09e9f..98bc69d 100644 --- a/universal7885-common/apps/aidl-support/parts/default/FlashLight.cpp +++ b/universal7885-common/apps/aidl-support/parts/default/FlashLight.cpp @@ -37,7 +37,7 @@ constexpr const char *TORCH_LVL = ::ndk::ScopedAStatus FlashBrightness::readFlashlightstats(bool s2mu106, int32_t *_aidl_return) { *_aidl_return = - s2mu106 ? FileIO::readline(TORCH_LVL) / 21 : FileIO::readline(TORCH_LVL); + s2mu106 ? FileIO::readint(TORCH_LVL) / 21 : FileIO::readint(TORCH_LVL); return ::ndk::ScopedAStatus::ok(); } diff --git a/universal7885-common/apps/aidl-support/parts/default/SmartCharge.cpp b/universal7885-common/apps/aidl-support/parts/default/SmartCharge.cpp index 565e96c..ecf2e35 100644 --- a/universal7885-common/apps/aidl-support/parts/default/SmartCharge.cpp +++ b/universal7885-common/apps/aidl-support/parts/default/SmartCharge.cpp @@ -22,7 +22,7 @@ namespace aidl::vendor::eureka::hardware::parts { void SmartCharge::battery_monitor(void) { while (kShouldRun) { - auto batt = FileIO::readline(BATTERY_CAPACITY_CURRENT); + auto batt = FileIO::readint(BATTERY_CAPACITY_CURRENT); if (batt >= limit) { if (kTookAction) goto sleep;