Mark ab/7061308 as merged in stage.
Bug: 180401296
Merged-In: Iaed0adc0e4479d50326f9e3093b2fa497cfc0ec0
Change-Id: I06bf2f47428370a32e53fe35470795e5830cc5e0
diff --git a/Android.bp b/Android.bp
index 220ee02..4a90312 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,9 @@
// Copyright 2013 The Android Open Source Project
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
cc_library_shared {
name: "libmemtrack",
vendor_available: true,
@@ -18,7 +22,7 @@
"libhidlbase",
"libutils",
"android.hardware.memtrack@1.0",
- "android.hardware.memtrack-unstable-ndk_platform",
+ "android.hardware.memtrack-V1-ndk_platform",
],
cflags: [
"-Wall",
diff --git a/OWNERS b/OWNERS
index 70b375f..91ea0cc 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1 +1,2 @@
ccross@google.com
+surenb@google.com
\ No newline at end of file
diff --git a/include/memtrack/memtrack.h b/include/memtrack/memtrack.h
index 2134a6f..91dd8c8 100644
--- a/include/memtrack/memtrack.h
+++ b/include/memtrack/memtrack.h
@@ -129,6 +129,33 @@
*/
ssize_t memtrack_proc_other_pss(struct memtrack_proc *p);
+/**
+ * class DeviceInfo
+ *
+ * Contains the device id and name.
+ */
+namespace aidl {
+namespace android {
+namespace hardware {
+namespace memtrack {
+
+class DeviceInfo;
+
+} // namespace memtrack
+} // namespace hardware
+} // namespace android
+} // namespace aidl
+
+/**
+ * memtrack_gpu_device_info
+ *
+ * Populates the @device_info vector with the DeviceInfo for all GPU devices.
+ *
+ * Returns true on success and false otherwise.
+ */
+bool memtrack_gpu_device_info(
+ std::vector<aidl::android::hardware::memtrack::DeviceInfo>* device_info);
+
#ifdef __cplusplus
}
#endif
diff --git a/memtrack.cpp b/memtrack.cpp
index 807a5c3..297d8ce 100644
--- a/memtrack.cpp
+++ b/memtrack.cpp
@@ -104,6 +104,16 @@
return V_aidl::IMemtrack::fromBinder(memtrack_binder);
}
+bool memtrack_gpu_device_info(std::vector<V_aidl::DeviceInfo>* device_info) {
+ std::shared_ptr<V_aidl::IMemtrack> service = get_aidl_instance();
+ if (!service) {
+ return false;
+ }
+
+ auto status = service->getGpuDeviceInfo(device_info);
+ return status.isOk();
+}
+
memtrack_proc *memtrack_proc_new(void)
{
return new memtrack_proc();
