diff options
| author | Vasu Nori <vnori@google.com> | 2011-01-27 15:00:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-27 15:00:38 -0800 |
| commit | 242fa0eb73d555eb025c39cf212030f00cb53cb4 (patch) | |
| tree | c30d2031e593792ec90424592c8caeeb3314d34f /core/tests | |
| parent | 57e7aa12d960cc20b2620b367be39e921f1a145d (diff) | |
| parent | ce3b35a7b0b80061692d9fa1977cee68b365728c (diff) | |
| download | frameworks_base-242fa0eb73d555eb025c39cf212030f00cb53cb4.zip frameworks_base-242fa0eb73d555eb025c39cf212030f00cb53cb4.tar.gz frameworks_base-242fa0eb73d555eb025c39cf212030f00cb53cb4.tar.bz2 | |
am ce3b35a7: Merge "bug:3398527 return List insttead of ArrayList from public API" into honeycomb
* commit 'ce3b35a7b0b80061692d9fa1977cee68b365728c':
bug:3398527 return List insttead of ArrayList from public API
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()); |