Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 242fa0eb authored by Vasu Nori's avatar Vasu Nori Committed by Android Git Automerger
Browse files

am ce3b35a7: Merge "bug:3398527 return List insttead of ArrayList from public API" into honeycomb 

* commit 'ce3b35a7':
  bug:3398527 return List insttead of ArrayList from public API
parents 57e7aa12 ce3b35a7

api/11.xml

+1 −1
Original line number Diff line number Diff line
@@ -70101,7 +70101,7 @@ 
</parameter>

</method>

<method name="getAttachedDbs"

 return="java.util.ArrayList&lt;android.util.Pair&lt;java.lang.String, java.lang.String&gt;&gt;"

 return="java.util.List&lt;android.util.Pair&lt;java.lang.String, java.lang.String&gt;&gt;"

 abstract="false"

 native="false"

 synchronized="false"

api/current.xml

+1 −1
Original line number Diff line number Diff line
@@ -70123,7 +70123,7 @@ 
</parameter>

</method>

<method name="getAttachedDbs"

 return="java.util.ArrayList&lt;android.util.Pair&lt;java.lang.String, java.lang.String&gt;&gt;"

 return="java.util.List&lt;android.util.Pair&lt;java.lang.String, java.lang.String&gt;&gt;"

 abstract="false"

 native="false"

 synchronized="false"

core/java/android/database/DefaultDatabaseErrorHandler.java

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
package android.database;



import java.io.File;

import java.util.ArrayList;

import java.util.List;



import android.database.sqlite.SQLiteDatabase;

import android.database.sqlite.SQLiteException;
@@ -65,7 +65,7 @@ public final class DefaultDatabaseErrorHandler implements DatabaseErrorHandler { 
            return;

        }



        ArrayList<Pair<String, String>> attachedDbs = null;

        List<Pair<String, String>> attachedDbs = null;

        try {

            // Close the database, which will cause subsequent operations to fail.

            // before that, get the attached database list first.

core/java/android/database/sqlite/SQLiteDatabase.java

+4 −3
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import dalvik.system.BlockGuard; 
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 @@ public class SQLiteDatabase extends SQLiteClosable { 
                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 @@ public class SQLiteDatabase extends SQLiteClosable { 
     * @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 class SQLiteDatabase extends SQLiteClosable { 
     */

    public boolean isDatabaseIntegrityOk() {

        verifyDbIsOpen();

        ArrayList<Pair<String, String>> attachedDbs = null;

        List<Pair<String, String>> attachedDbs = null;

        try {

            attachedDbs = getAttachedDbs();

            if (attachedDbs == null) {

core/tests/coretests/src/android/database/DatabaseGeneralTest.java

+2 −1
Original line number Diff line number Diff line
@@ -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());