summaryrefslogtreecommitdiffstats
path: root/dalvik
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-05-02 17:23:03 -0700
committerAndreas Gampe <agampe@google.com>2014-05-02 17:23:03 -0700
commit307e642f661f73cf22fa689ee40181481768c400 (patch)
tree3a84375f4a6a6aacf379822faf8f215972c37993 /dalvik
parentea3a6f5a2c49b0aa253503fc2236d5ba48f19eac (diff)
downloadlibcore-307e642f661f73cf22fa689ee40181481768c400.zip
libcore-307e642f661f73cf22fa689ee40181481768c400.tar.gz
libcore-307e642f661f73cf22fa689ee40181481768c400.tar.bz2
Libcore: Remove <> in CloseGuardMonitor test class
Regrettably we're stuck with Java 1.6 in some branches, which will not accept the diamond operator. Change-Id: Iab1bd30bdcd70e312c2809a42d2339e0503a3250
Diffstat (limited to 'dalvik')
-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