diff options
| author | Bill Napier <napier@google.com> | 2018-08-24 21:13:13 +0000 |
|---|---|---|
| committer | Bill Napier <napier@google.com> | 2018-08-24 21:13:13 +0000 |
| commit | d7d338f359be2849c26c881650bd28644acbcf55 (patch) | |
| tree | 02c556cae9e678a4469c558a63f7991f27f49889 /core/java/android/os/Debug.java | |
| parent | 1f3b0302fda5cbbe0d5683cc057c84aaa1b8925c (diff) | |
Revert "Throttle requests to ActivityManager.getProcessMemoryInfo()."
This reverts commit 1f3b0302fda5cbbe0d5683cc057c84aaa1b8925c.
Reason for revert: broke SDK builds. See ab/4976218
Change-Id: Id532e20eed8e13735a09cca5affc92005b685744
Diffstat (limited to 'core/java/android/os/Debug.java')
| -rw-r--r-- | core/java/android/os/Debug.java | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java index aba81af00282..6ddcbe0b3b64 100644 --- a/core/java/android/os/Debug.java +++ b/core/java/android/os/Debug.java @@ -321,45 +321,6 @@ public final class Debug } /** - * @hide Copy contents from another object. - */ - public void set(MemoryInfo other) { - dalvikPss = other.dalvikPss; - dalvikSwappablePss = other.dalvikSwappablePss; - dalvikRss = other.dalvikRss; - dalvikPrivateDirty = other.dalvikPrivateDirty; - dalvikSharedDirty = other.dalvikSharedDirty; - dalvikPrivateClean = other.dalvikPrivateClean; - dalvikSharedClean = other.dalvikSharedClean; - dalvikSwappedOut = other.dalvikSwappedOut; - dalvikSwappedOutPss = other.dalvikSwappedOutPss; - - nativePss = other.nativePss; - nativeSwappablePss = other.nativeSwappablePss; - nativeRss = other.nativeRss; - nativePrivateDirty = other.nativePrivateDirty; - nativeSharedDirty = other.nativeSharedDirty; - nativePrivateClean = other.nativePrivateClean; - nativeSharedClean = other.nativeSharedClean; - nativeSwappedOut = other.nativeSwappedOut; - nativeSwappedOutPss = other.nativeSwappedOutPss; - - otherPss = other.otherPss; - otherSwappablePss = other.otherSwappablePss; - otherRss = other.otherRss; - otherPrivateDirty = other.otherPrivateDirty; - otherSharedDirty = other.otherSharedDirty; - otherPrivateClean = other.otherPrivateClean; - otherSharedClean = other.otherSharedClean; - otherSwappedOut = other.otherSwappedOut; - otherSwappedOutPss = other.otherSwappedOutPss; - - hasSwappedOutPss = other.hasSwappedOutPss; - - System.arraycopy(other.otherStats, 0, otherStats, 0, otherStats.length); - } - - /** * Return total PSS memory usage in kB. */ public int getTotalPss() { |
