diff options
| author | Suren Baghdasaryan <surenb@google.com> | 2020-09-23 18:25:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-23 18:25:44 +0000 |
| commit | da855f3363d0f8cc73d65f8511f6acd2156b54cb (patch) | |
| tree | 983b270c3abc606a4f65197cf007b327cafd2e15 /core/java/android | |
| parent | 10e02f55c0eacd4093b53ae05c9e9446ef03e35f (diff) | |
| parent | d493ed705b019557c1570a63ce1a74c9c21b2a60 (diff) | |
Merge "Report ION usage event when ION heap size is 0" am: 7687adc00d am: d493ed705b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431373
Change-Id: I11cfef78933c1978919b6e85bc0ebf817993d73a
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/Debug.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java index 4b2cfe222dd6..a2e53e29193c 100644 --- a/core/java/android/os/Debug.java +++ b/core/java/android/os/Debug.java @@ -2551,14 +2551,16 @@ public final class Debug public static native long getZramFreeKb(); /** - * Return memory size in kilobytes allocated for ION heaps. + * Return memory size in kilobytes allocated for ION heaps or -1 if + * /sys/kernel/ion/total_heaps_kb could not be read. * * @hide */ public static native long getIonHeapsSizeKb(); /** - * Return memory size in kilobytes allocated for ION pools. + * Return memory size in kilobytes allocated for ION pools or -1 if + * /sys/kernel/ion/total_pools_kb could not be read. * * @hide */ |