Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Run finalizers before counting for StrictMode." into klp-modular-dev

Browse Source
This commit is contained in:
Mark Renouf
2014-03-24 15:22:55 +00:00
committed by Android (Google) Code Review
parent c01e1aeb0d 9c5c56eb51
commit a63cd9f424
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/os/StrictMode.java
View File

@@ -1449,7 +1449,11 @@ public final class StrictMode {
if (policy.classInstanceLimit.size() == 0) { if (policy.classInstanceLimit.size() == 0) {
return; return;
} }
Runtime.getRuntime().gc();
System.gc();
System.runFinalization();
System.gc();
// Note: classInstanceLimit is immutable, so this is lock-free // Note: classInstanceLimit is immutable, so this is lock-free
for (Map.Entry<Class, Integer> entry : policy.classInstanceLimit.entrySet()) { for (Map.Entry<Class, Integer> entry : policy.classInstanceLimit.entrySet()) {
Class klass = entry.getKey(); Class klass = entry.getKey();
@@ -2005,7 +2009,10 @@ public final class StrictMode {
// noticeably less responsive during orientation changes when activities are // noticeably less responsive during orientation changes when activities are
// being restarted. Granted, it is only a problem when StrictMode is enabled // being restarted. Granted, it is only a problem when StrictMode is enabled
// but it is annoying. // but it is annoying.
Runtime.getRuntime().gc();
System.gc();
System.runFinalization();
System.gc();
long instances = VMDebug.countInstancesOfClass(klass, false); long instances = VMDebug.countInstancesOfClass(klass, false);
if (instances > limit) { if (instances > limit) {