diff options
| author | Vasu Nori <vnori@google.com> | 2011-01-27 12:46:00 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-27 12:46:00 -0800 |
| commit | ce3b35a7b0b80061692d9fa1977cee68b365728c (patch) | |
| tree | 6dac2862e20d3b32ec210ec244b5e83cedef30a2 /core/tests | |
| parent | 74d39bd902c8561153647b19625b32938f38498c (diff) | |
| parent | a017edace756956cd4b4789a85316e3681d04a7e (diff) | |
| download | frameworks_base-ce3b35a7b0b80061692d9fa1977cee68b365728c.zip frameworks_base-ce3b35a7b0b80061692d9fa1977cee68b365728c.tar.gz frameworks_base-ce3b35a7b0b80061692d9fa1977cee68b365728c.tar.bz2 | |
Merge "bug:3398527 return List insttead of ArrayList from public API" into honeycomb
Diffstat (limited to 'core/tests')
| -rw-r--r-- | core/tests/coretests/src/android/database/DatabaseGeneralTest.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/tests/coretests/src/android/database/DatabaseGeneralTest.java b/core/tests/coretests/src/android/database/DatabaseGeneralTest.java index cd38bf0..6786700 100644 --- a/core/tests/coretests/src/android/database/DatabaseGeneralTest.java +++ b/core/tests/coretests/src/android/database/DatabaseGeneralTest.java @@ -37,6 +37,7 @@ import junit.framework.Assert; import java.io.File; import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import java.util.Locale; public class DatabaseGeneralTest extends AndroidTestCase implements PerformanceTestCase { @@ -1130,7 +1131,7 @@ public class DatabaseGeneralTest extends AndroidTestCase implements PerformanceT assertTrue(new File(attachedDb1File).exists()); assertNotNull(dbObj); assertTrue(dbObj.isOpen()); - ArrayList<Pair<String, String>> attachedDbs = dbObj.getAttachedDbs(); + List<Pair<String, String>> attachedDbs = dbObj.getAttachedDbs(); try { errorHandler.onCorruption(dbObj); assertFalse(dbfile.exists()); |