diff options
| author | Mark Renouf <mrenouf@google.com> | 2014-03-24 15:33:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-24 15:33:12 +0000 |
| commit | 7390d4ab8d12d5ffa5d28341096f4425247204a0 (patch) | |
| tree | ad0621fdfcc2327a4340086b670f0f6dddd515f2 /core/java/android | |
| parent | 5332706b87c8772b97198e30c7cb4cc4ef3b577f (diff) | |
| parent | 3796594cd76238c46dd79a990ae1797f197dea85 (diff) | |
| download | frameworks_base-7390d4ab8d12d5ffa5d28341096f4425247204a0.zip frameworks_base-7390d4ab8d12d5ffa5d28341096f4425247204a0.tar.gz frameworks_base-7390d4ab8d12d5ffa5d28341096f4425247204a0.tar.bz2 | |
am 3796594c: am a63cd9f4: Merge "Run finalizers before counting for StrictMode." into klp-modular-dev
* commit '3796594cd76238c46dd79a990ae1797f197dea85':
Run finalizers before counting for StrictMode.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/StrictMode.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java index d794ca6..ea71ad8 100644 --- a/core/java/android/os/StrictMode.java +++ b/core/java/android/os/StrictMode.java @@ -1449,7 +1449,11 @@ public final class StrictMode { if (policy.classInstanceLimit.size() == 0) { return; } - Runtime.getRuntime().gc(); + + System.gc(); + System.runFinalization(); + System.gc(); + // Note: classInstanceLimit is immutable, so this is lock-free for (Map.Entry<Class, Integer> entry : policy.classInstanceLimit.entrySet()) { Class klass = entry.getKey(); @@ -2005,7 +2009,10 @@ public final class StrictMode { // noticeably less responsive during orientation changes when activities are // being restarted. Granted, it is only a problem when StrictMode is enabled // but it is annoying. - Runtime.getRuntime().gc(); + + System.gc(); + System.runFinalization(); + System.gc(); long instances = VMDebug.countInstancesOfClass(klass, false); if (instances > limit) { |