diff options
author | Andreas Gampe <agampe@google.com> | 2014-05-06 15:57:50 +0000 |
---|---|---|
committer | Andreas Gampe <agampe@google.com> | 2014-05-06 16:00:05 +0000 |
commit | d3b5f049d29413ce7dc5cc051e860e47fc515239 (patch) | |
tree | 2f3b811eda7fe73233645cdfc40681392bcaf89b /dalvik/src | |
parent | 307e642f661f73cf22fa689ee40181481768c400 (diff) | |
download | libcore-d3b5f049d29413ce7dc5cc051e860e47fc515239.zip libcore-d3b5f049d29413ce7dc5cc051e860e47fc515239.tar.gz libcore-d3b5f049d29413ce7dc5cc051e860e47fc515239.tar.bz2 |
Revert "Libcore: Remove <> in CloseGuardMonitor test class"
Dalvik-dev has switched to Java 7 now, so diamonds are allowed now.
This reverts commit 307e642f661f73cf22fa689ee40181481768c400.
Change-Id: Ia1893bfea09aa2de65fed997bc3e5e3805d92387
Diffstat (limited to 'dalvik/src')
-rw-r--r-- | dalvik/src/test/java/dalvik/system/CloseGuardMonitor.java | 4 |
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 94b310d..b5bf380 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<Throwable>(); + private final List<Throwable> closeGuardAllocationSites = new CopyOnWriteArrayList<>(); /** * 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<Object>(new Object()); + WeakReference<Object> reference = new WeakReference<>(new Object()); try { // 'Force' a GC and finalize to cause CloseGuards to report warnings. Doesn't loop |