Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimized database creation for a new user

Browse Source 
If the file doesn't exist, database can be kept in memory. It's safe because
the database will be migrated and disposed of immediately after onCreate
finishes.

Bug: 26237300
Change-Id: Ib37c520f28960c8d6b9ce8dd719ffbcc11a97a58
This commit is contained in:
Fyodor Kupolov
2015-12-17 10:47:33 -08:00
parent 1d724e02b0
commit 497b5faba9
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
View File

@@ -116,6 +116,12 @@ class DatabaseHelper extends SQLiteOpenHelper {
// cleaned up automatically when the user is deleted.
File databaseFile = new File(
Environment.getUserSystemDirectory(userHandle), DATABASE_NAME);
// If databaseFile doesn't exist, database can be kept in memory. It's safe because the
// database will be migrated and disposed of immediately after onCreate finishes
if (!databaseFile.exists()) {
Log.i(TAG, "No previous database file exists - running in in-memory mode");
return null;
}
return databaseFile.getPath();
}
}
@@ -130,8 +136,16 @@ class DatabaseHelper extends SQLiteOpenHelper {
return mValidTables.contains(name);
}
private boolean isInMemory() {
return getDatabaseName() == null;
}
public void dropDatabase() {
close();
// No need to remove files if db is in memory
if (isInMemory()) {
return;
}
File databaseFile = mContext.getDatabasePath(getDatabaseName());
if (databaseFile.exists()) {
databaseFile.delete();
@@ -145,6 +159,10 @@ class DatabaseHelper extends SQLiteOpenHelper {
public void backupDatabase() {
close();
// No need to backup files if db is in memory
if (isInMemory()) {
return;
}
File databaseFile = mContext.getDatabasePath(getDatabaseName());
if (!databaseFile.exists()) {
return;