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

Commit 512596d4 authored by Vasu Nori's avatar Vasu Nori Committed by Android (Google) Code Review
Browse files

Merge "new API in Context. on openDatabase, new param DatabaseErrorHandler"

parents f8b0f11a 74f170f9

api/current.xml

+75 −0
Original line number Diff line number Diff line
@@ -39461,6 +39461,25 @@ 
<parameter name="factory" type="android.database.sqlite.SQLiteDatabase.CursorFactory">

</parameter>

</method>

<method name="openOrCreateDatabase"

 return="android.database.sqlite.SQLiteDatabase"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="name" type="java.lang.String">

</parameter>

<parameter name="mode" type="int">

</parameter>

<parameter name="factory" type="android.database.sqlite.SQLiteDatabase.CursorFactory">

</parameter>

<parameter name="errorHandler" type="android.database.DatabaseErrorHandler">

</parameter>

</method>

<method name="peekWallpaper"

 return="android.graphics.drawable.Drawable"

 abstract="true"
@@ -40888,6 +40907,25 @@ 
<parameter name="factory" type="android.database.sqlite.SQLiteDatabase.CursorFactory">

</parameter>

</method>

<method name="openOrCreateDatabase"

 return="android.database.sqlite.SQLiteDatabase"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="name" type="java.lang.String">

</parameter>

<parameter name="mode" type="int">

</parameter>

<parameter name="factory" type="android.database.sqlite.SQLiteDatabase.CursorFactory">

</parameter>

<parameter name="errorHandler" type="android.database.DatabaseErrorHandler">

</parameter>

</method>

<method name="peekWallpaper"

 return="android.graphics.drawable.Drawable"

 abstract="false"
@@ -61029,6 +61067,24 @@ 
<parameter name="version" type="int">

</parameter>

</constructor>

<constructor name="SQLiteOpenHelper"

 type="android.database.sqlite.SQLiteOpenHelper"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="context" type="android.content.Context">

</parameter>

<parameter name="name" type="java.lang.String">

</parameter>

<parameter name="factory" type="android.database.sqlite.SQLiteDatabase.CursorFactory">

</parameter>

<parameter name="version" type="int">

</parameter>

<parameter name="errorHandler" type="android.database.DatabaseErrorHandler">

</parameter>

</constructor>

<method name="close"

 return="void"

 abstract="false"
@@ -155111,6 +155167,25 @@ 
<parameter name="factory" type="android.database.sqlite.SQLiteDatabase.CursorFactory">

</parameter>

</method>

<method name="openOrCreateDatabase"

 return="android.database.sqlite.SQLiteDatabase"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="file" type="java.lang.String">

</parameter>

<parameter name="mode" type="int">

</parameter>

<parameter name="factory" type="android.database.sqlite.SQLiteDatabase.CursorFactory">

</parameter>

<parameter name="errorHandler" type="android.database.DatabaseErrorHandler">

</parameter>

</method>

<method name="peekWallpaper"

 return="android.graphics.drawable.Drawable"

 abstract="false"

core/java/android/app/ContextImpl.java

+10 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import android.content.pm.PackageParser.Package; 
import android.content.res.AssetManager;

import android.content.res.Resources;

import android.content.res.XmlResourceParser;

import android.database.DatabaseErrorHandler;

import android.database.sqlite.SQLiteDatabase;

import android.database.sqlite.SQLiteDatabase.CursorFactory;

import android.graphics.Bitmap;
@@ -542,6 +543,15 @@ class ContextImpl extends Context { 
        return db;

    }



    @Override

    public SQLiteDatabase openOrCreateDatabase(String name, int mode, CursorFactory factory,

            DatabaseErrorHandler errorHandler) {

        File f = validateFilePath(name, true);

        SQLiteDatabase db = SQLiteDatabase.openOrCreateDatabase(f.getPath(), factory, errorHandler);

        setFilePermissionsFromMode(f.getPath(), mode, 0);

        return db;

    }



    @Override

    public boolean deleteDatabase(String name) {

        try {

core/java/android/content/Context.java

+28 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ import android.content.pm.PackageManager; 
import android.content.res.AssetManager;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.database.DatabaseErrorHandler;

import android.database.DefaultDatabaseErrorHandler;

import android.database.sqlite.SQLiteDatabase;

import android.database.sqlite.SQLiteDatabase.CursorFactory;

import android.graphics.Bitmap;
@@ -587,6 +589,32 @@ public abstract class Context { 
    public abstract SQLiteDatabase openOrCreateDatabase(String name,

            int mode, CursorFactory factory);



    /**

     * Open a new private SQLiteDatabase associated with this Context's

     * application package.  Creates the database file if it doesn't exist.

     *

     * <p>Accepts input param: a concrete instance of {@link DatabaseErrorHandler} to be

     * used to handle corruption when sqlite reports database corruption.</p>

     *

     * @param name The name (unique in the application package) of the database.

     * @param mode Operating mode.  Use 0 or {@link #MODE_PRIVATE} for the

     *     default operation, {@link #MODE_WORLD_READABLE}

     *     and {@link #MODE_WORLD_WRITEABLE} to control permissions.

     * @param factory An optional factory class that is called to instantiate a

     *     cursor when query is called.

     * @param errorHandler the {@link DatabaseErrorHandler} to be used when sqlite reports database

     * corruption. if null, {@link DefaultDatabaseErrorHandler} is assumed.

     * @return The contents of a newly created database with the given name.

     * @throws android.database.sqlite.SQLiteException if the database file could not be opened.

     *

     * @see #MODE_PRIVATE

     * @see #MODE_WORLD_READABLE

     * @see #MODE_WORLD_WRITEABLE

     * @see #deleteDatabase

     */

    public abstract SQLiteDatabase openOrCreateDatabase(String name,

            int mode, CursorFactory factory, DatabaseErrorHandler errorHandler);



    /**

     * Delete an existing private SQLiteDatabase associated with this Context's

     * application package.

core/java/android/content/ContextWrapper.java

+7 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.pm.ApplicationInfo; 
import android.content.pm.PackageManager;

import android.content.res.AssetManager;

import android.content.res.Resources;

import android.database.DatabaseErrorHandler;

import android.database.sqlite.SQLiteDatabase;

import android.database.sqlite.SQLiteDatabase.CursorFactory;

import android.graphics.Bitmap;
@@ -203,6 +204,12 @@ public class ContextWrapper extends Context { 
        return mBase.openOrCreateDatabase(name, mode, factory);

    }



    @Override

    public SQLiteDatabase openOrCreateDatabase(String name, int mode, CursorFactory factory,

            DatabaseErrorHandler errorHandler) {

        return mBase.openOrCreateDatabase(name, mode, factory, errorHandler);

    }



    @Override

    public boolean deleteDatabase(String name) {

        return mBase.deleteDatabase(name);

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

+17 −4
Original line number Diff line number Diff line
@@ -837,10 +837,23 @@ public class SQLiteDatabase extends SQLiteClosable { 
    }



    /**

     * same as {@link #openDatabase(String, CursorFactory, int)} except for an additional param

     * errorHandler.

     * @param errorHandler the {@link DatabaseErrorHandler} obj to be used when database

     * corruption is detected on the database.

     * Open the database according to the flags {@link #OPEN_READWRITE}

     * {@link #OPEN_READONLY} {@link #CREATE_IF_NECESSARY} and/or {@link #NO_LOCALIZED_COLLATORS}.

     *

     * <p>Sets the locale of the database to the  the system's current locale.

     * Call {@link #setLocale} if you would like something else.</p>

     *

     * <p>Accepts input param: a concrete instance of {@link DatabaseErrorHandler} to be

     * used to handle corruption when sqlite reports database corruption.</p>

     *

     * @param path to database file to open and/or create

     * @param factory an optional factory class that is called to instantiate a

     *            cursor when query is called, or null for default

     * @param flags to control database access mode

     * @param errorHandler the {@link DatabaseErrorHandler} obj to be used to handle corruption

     * when sqlite reports database corruption

     * @return the newly opened database

     * @throws SQLiteException if the database cannot be opened

     */

    public static SQLiteDatabase openDatabase(String path, CursorFactory factory, int flags,

            DatabaseErrorHandler errorHandler) {