bug:3398527 return List insttead of ArrayList from public API
Change-Id: Idbdcb59fe860a9168c9ef6c00eb128b05fce84ff
diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java
index 1a43b30..b3fd914 100644
--- a/core/java/android/database/sqlite/SQLiteDatabase.java
+++ b/core/java/android/database/sqlite/SQLiteDatabase.java
@@ -40,6 +40,7 @@
import java.io.File;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
+import java.util.List;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -2504,7 +2505,7 @@
String lastnode = path.substring((indx != -1) ? ++indx : 0);
// get list of attached dbs and for each db, get its size and pagesize
- ArrayList<Pair<String, String>> attachedDbs = db.getAttachedDbs();
+ List<Pair<String, String>> attachedDbs = db.getAttachedDbs();
if (attachedDbs == null) {
continue;
}
@@ -2560,7 +2561,7 @@
* @return ArrayList of pairs of (database name, database file path) or null if the database
* is not open.
*/
- public ArrayList<Pair<String, String>> getAttachedDbs() {
+ public List<Pair<String, String>> getAttachedDbs() {
if (!isOpen()) {
return null;
}
@@ -2613,7 +2614,7 @@
*/
public boolean isDatabaseIntegrityOk() {
verifyDbIsOpen();
- ArrayList<Pair<String, String>> attachedDbs = null;
+ List<Pair<String, String>> attachedDbs = null;
try {
attachedDbs = getAttachedDbs();
if (attachedDbs == null) {