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

Commit a337d044 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use SQLiteDatabase.deleteDatabase to delete a temp database"

parents 3a2e3b03 15e7c62e

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+1 −7
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ class DatabaseHelper extends SQLiteOpenHelper { 


    private static final HashSet<String> mValidTables = new HashSet<String>();



    private static final String DATABASE_JOURNAL_SUFFIX = "-journal";

    private static final String DATABASE_BACKUP_SUFFIX = "-backup";



    private static final String TABLE_SYSTEM = "system";
@@ -148,12 +147,7 @@ class DatabaseHelper extends SQLiteOpenHelper { 
        }

        File databaseFile = mContext.getDatabasePath(getDatabaseName());

        if (databaseFile.exists()) {

            databaseFile.delete();

        }

        File databaseJournalFile = mContext.getDatabasePath(getDatabaseName()

                + DATABASE_JOURNAL_SUFFIX);

        if (databaseJournalFile.exists()) {

            databaseJournalFile.delete();

            SQLiteDatabase.deleteDatabase(databaseFile);

        }

    }