summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hans Boehm <hboehm@google.com> 2022-10-07 01:20:03 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-07 01:20:03 +0000
commit0ec0ceb9bb3d8c13d546c82359c185b3c91e96bd (patch)
tree28f704cb2181b3b22c155f1a62274217f3696757
parenta824443ad990c3a84e338c0f7d54a688c2d44455 (diff)
parent3d794a3a66c27fb0fceddceadcba807e8a675288 (diff)
Merge "Make LoadClass collect garbage as promised" am: e16473b1da am: 87376c8b47 am: 3d794a3a66
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2150615 Change-Id: Ic1ceed65d45931640ee4c4c33d726dbc1db09290 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--tools/preload/loadclass/LoadClass.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/preload/loadclass/LoadClass.java b/tools/preload/loadclass/LoadClass.java
index a71b6a8b145e..3f6658ab8c65 100644
--- a/tools/preload/loadclass/LoadClass.java
+++ b/tools/preload/loadclass/LoadClass.java
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-import android.util.Log;
import android.os.Debug;
+import android.util.Log;
/**
* Loads a class, runs the garbage collector, and prints showmap output.
@@ -28,7 +28,7 @@ class LoadClass {
System.loadLibrary("android_runtime");
if (registerNatives() < 0) {
- throw new RuntimeException("Error registering natives.");
+ throw new RuntimeException("Error registering natives.");
}
Debug.startAllocCounting();
@@ -46,7 +46,7 @@ class LoadClass {
}
}
- System.gc();
+ Runtime.getRuntime().gc();
int allocCount = Debug.getGlobalAllocCount();
int allocSize = Debug.getGlobalAllocSize();
@@ -73,7 +73,7 @@ class LoadClass {
response.append(',').append(freedCount);
response.append(',').append(freedSize);
response.append(',').append(nativeHeapSize);
-
+
System.out.println(response.toString());
}