Merge "Parse process starttime."
diff --git a/Android.bp b/Android.bp
index a6b4eae..531bfa2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -64,6 +64,7 @@
"com.android.art",
"com.android.art.debug",
],
+ min_sdk_version: "apex_inherit",
}
// Tests
diff --git a/include/procinfo/process_map.h b/include/procinfo/process_map.h
index f5fee07..d8a563c 100644
--- a/include/procinfo/process_map.h
+++ b/include/procinfo/process_map.h
@@ -229,10 +229,23 @@
return ReadMapFileContent(&content[0], callback);
}
+inline bool ReadMapFile(const std::string& map_file,
+ const MapInfoParamsCallback& callback) {
+ std::string content;
+ if (!android::base::ReadFileToString(map_file, &content)) {
+ return false;
+ }
+ return ReadMapFileContent(&content[0], callback);
+}
+
inline bool ReadProcessMaps(pid_t pid, const MapInfoCallback& callback) {
return ReadMapFile("/proc/" + std::to_string(pid) + "/maps", callback);
}
+inline bool ReadProcessMaps(pid_t pid, const MapInfoParamsCallback& callback) {
+ return ReadMapFile("/proc/" + std::to_string(pid) + "/maps", callback);
+}
+
inline bool ReadProcessMaps(pid_t pid, std::vector<MapInfo>* maps) {
return ReadProcessMaps(pid, [&](const MapInfo& mapinfo) { maps->emplace_back(mapinfo); });
}