bunnypad/android_device_samsung_a20
Watch
1
0
Fork
You've already forked android_device_samsung_a20
 0
mirror of https://github.com/chararomandroid/android_device_samsung_a20 synced 2026-08-23 20:45:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

universal7885: fm-aidl: Fixups

Browse source 
- libfileio: Move back to liblog.
- FMDevCtrl: Add some loggings
- FM-app: Call open() before set(apppid)
This commit is contained in:
roynatech2544 2022-11-01 12:13:31 +09:00
commit 5c7c906519
4 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
universal7885-common/apps/aidl-support/libfileio/Android.bp
View file

@ -4,7 +4,7 @@ cc_library_shared {
cppflags: ["-fexceptions"],
local_include_dirs: ["include"],
export_include_dirs: ["include"],
shared_libs: ["libbase"],
shared_libs: ["liblog"],
header_libs: ["logformat"],
}

16
universal7885-common/apps/aidl-support/libfileio/FileIO.cpp
View file

@ -1,4 +1,6 @@
#include <android-base/logging.h>
#define LOG_TAG "libFileIO"
#include <log/log.h>
#include <fstream>
#include <string>
@ -13,20 +15,20 @@ int readline(const char *path) {
std::ifstream file;
std::string value;
file.open(path);
LOG(DEBUG) << make_str("%s: Opening %s", __func__, path);
ALOGD(make_str("%s: Opening %s", __func__, path));
if (file.is_open()) {
getline(file, value);
file.close();
} else {
LOG(ERROR) << make_str("%s: Failed to open %s", __func__, path);
ALOGE(make_str("%s: Failed to open %s", __func__, path));
return EXIT_ERR;
}
try {
return stoi(value);
} catch (std::invalid_argument const &ex) {
LOG(ERROR) << make_str("%s: stoi(): invalid argument: for %s", __func__, value.c_str());
ALOGE(make_str("%s: stoi(): invalid argument: for %s", __func__, value.c_str()));
} catch (std::out_of_range const &ex) {
LOG(ERROR) << make_str("%s: stoi(): out of range: for %s", __func__, value.c_str());
ALOGE(make_str("%s: stoi(): out of range: for %s", __func__, value.c_str()));
}
return EXIT_ERR;
}
@ -34,13 +36,13 @@ int readline(const char *path) {
void writeline(const char *path, const std::string& data) {
std::ofstream file;
file.open(path);
LOG(DEBUG) << make_str("%s: Opening %s, will write '%s'", __func__, path, data.c_str());
ALOGD(make_str("%s: Opening %s, will write '%s'", __func__, path, data.c_str()));
if (file.is_open()) {
file << data;
file.close();
return;
}
LOG(ERROR) << make_str("%s: Failed to open %s", __func__, path);
ALOGE(make_str("%s: Failed to open %s", __func__, path));
}
void writeline(const char *path, const int data) {