diff options
author | Jon Larimer <jlarimer@google.com> | 2015-01-30 22:24:43 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-30 22:24:43 +0000 |
commit | 90d5bd8daab404afc50470f5c19ea725bd2466fe (patch) | |
tree | 7a2f7f1685113a39df6c8b7139d9a2e7d66ca068 /core/tests | |
parent | 147b6a3522b7032ede24101f5ac32ec7d7afa9e9 (diff) | |
parent | feb362a5d194b30226caf2efbaae77991007c65c (diff) | |
download | frameworks_base-90d5bd8daab404afc50470f5c19ea725bd2466fe.zip frameworks_base-90d5bd8daab404afc50470f5c19ea725bd2466fe.tar.gz frameworks_base-90d5bd8daab404afc50470f5c19ea725bd2466fe.tar.bz2 |
am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit 'feb362a5d194b30226caf2efbaae77991007c65c':
Fix build breakage in older branches by avoiding <> notation
Diffstat (limited to 'core/tests')
-rw-r--r-- | core/tests/coretests/src/android/content/pm/ParceledListSliceTest.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/tests/coretests/src/android/content/pm/ParceledListSliceTest.java b/core/tests/coretests/src/android/content/pm/ParceledListSliceTest.java index e7f4bad..e5a92bf 100644 --- a/core/tests/coretests/src/android/content/pm/ParceledListSliceTest.java +++ b/core/tests/coretests/src/android/content/pm/ParceledListSliceTest.java @@ -11,7 +11,7 @@ public class ParceledListSliceTest extends TestCase { public void testSmallList() throws Exception { final int objectCount = 100; - List<SmallObject> list = new ArrayList<>(); + List<SmallObject> list = new ArrayList<SmallObject>(); for (int i = 0; i < objectCount; i++) { list.add(new SmallObject(i * 2, (i * 2) + 1)); } @@ -20,7 +20,7 @@ public class ParceledListSliceTest extends TestCase { Parcel parcel = Parcel.obtain(); try { - parcel.writeParcelable(new ParceledListSlice<>(list), 0); + parcel.writeParcelable(new ParceledListSlice<SmallObject>(list), 0); parcel.setDataPosition(0); slice = parcel.readParcelable(getClass().getClassLoader()); } finally { @@ -56,7 +56,7 @@ public class ParceledListSliceTest extends TestCase { final int thresholdBytes = 256 * 1024; final int objectCount = thresholdBytes / measureLargeObject(); - List<LargeObject> list = new ArrayList<>(); + List<LargeObject> list = new ArrayList<LargeObject>(); for (int i = 0; i < objectCount; i++) { list.add(new LargeObject( i * 5, @@ -71,7 +71,7 @@ public class ParceledListSliceTest extends TestCase { Parcel parcel = Parcel.obtain(); try { - parcel.writeParcelable(new ParceledListSlice<>(list), 0); + parcel.writeParcelable(new ParceledListSlice<LargeObject>(list), 0); parcel.setDataPosition(0); slice = parcel.readParcelable(getClass().getClassLoader()); } finally { @@ -95,7 +95,7 @@ public class ParceledListSliceTest extends TestCase { * Test that only homogeneous elements may be unparceled. */ public void testHomogeneousElements() throws Exception { - List<BaseObject> list = new ArrayList<>(); + List<BaseObject> list = new ArrayList<BaseObject>(); list.add(new LargeObject(0, 1, 2, 3, 4)); list.add(new SmallObject(5, 6)); list.add(new SmallObject(7, 8)); |