summaryrefslogtreecommitdiffstats
path: root/dalvik/src
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-05-03 00:46:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-03 00:46:44 +0000
commit8f9fffe7f67d3113d9ff993abc3c30604ff0ec6f (patch)
tree4ffe0b25bdcb0235d61f72d644fc4c7f95cb7fbf /dalvik/src
parent5ab3595209384f87486d6b05757d68925f90a31c (diff)
parentfd71cafeacb65447d4a7b47ffcfb169522d64271 (diff)
downloadlibcore-8f9fffe7f67d3113d9ff993abc3c30604ff0ec6f.zip
libcore-8f9fffe7f67d3113d9ff993abc3c30604ff0ec6f.tar.gz
libcore-8f9fffe7f67d3113d9ff993abc3c30604ff0ec6f.tar.bz2
am fd71cafe: am 82ae08ae: am 2684c1a5: Merge "Libcore: Remove <> in CloseGuardMonitor test class"
* commit 'fd71cafeacb65447d4a7b47ffcfb169522d64271': Libcore: Remove <> in CloseGuardMonitor test class
Diffstat (limited to 'dalvik/src')
-rw-r--r--dalvik/src/test/java/dalvik/system/CloseGuardMonitor.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/dalvik/src/test/java/dalvik/system/CloseGuardMonitor.java b/dalvik/src/test/java/dalvik/system/CloseGuardMonitor.java
index b5bf380..94b310d 100644
--- a/dalvik/src/test/java/dalvik/system/CloseGuardMonitor.java
+++ b/dalvik/src/test/java/dalvik/system/CloseGuardMonitor.java
@@ -47,7 +47,7 @@ public class CloseGuardMonitor implements Runnable {
* <p>Is thread safe as this will be called during finalization and so there are no guarantees
* as to whether it will be called concurrently or not.
*/
- private final List<Throwable> closeGuardAllocationSites = new CopyOnWriteArrayList<>();
+ private final List<Throwable> closeGuardAllocationSites = new CopyOnWriteArrayList<Throwable>();
/**
* Default constructor required for reflection.
@@ -75,7 +75,7 @@ public class CloseGuardMonitor implements Runnable {
@Override
public void run() {
// Create a weak reference to an object so that we can detect when it is garbage collected.
- WeakReference<Object> reference = new WeakReference<>(new Object());
+ WeakReference<Object> reference = new WeakReference<Object>(new Object());
try {
// 'Force' a GC and finalize to cause CloseGuards to report warnings. Doesn't loop