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

am f993fefc: Merge change Icbd74742 into eclair

Browse Source 
Merge commit 'f993fefc3b14ece3f0f3eac6bb3d241bffb3cdfb' into eclair-plus-aosp

* commit 'f993fefc3b14ece3f0f3eac6bb3d241bffb3cdfb':
  EventLog when a database file is deleted due to corruption.
This commit is contained in:
Jeff Hamilton
2009-09-29 12:22:22 -07:00
committed by Android Git Automerger
parent 2ed31083a2 f993fefc3b
commit 11bb09c382
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/database/sqlite/SQLiteDatabase.java
View File

@@ -54,7 +54,8 @@ import java.util.concurrent.locks.ReentrantLock;
*/
public class SQLiteDatabase extends SQLiteClosable {
private static final String TAG = "Database";
private static final int DB_OPERATION_EVENT = 52000;
private static final int EVENT_DB_OPERATION = 52000;
private static final int EVENT_DB_CORRUPT = 75004;
/**
* Algorithms used in ON CONFLICT clause
@@ -739,6 +740,7 @@ public class SQLiteDatabase extends SQLiteClosable {
// Try to recover from this, if we can.
// TODO: should we do this for other open failures?
Log.e(TAG, "Deleting and re-creating corrupt database " + path, e);
EventLog.writeEvent(EVENT_DB_CORRUPT, path);
new File(path).delete();
return new SQLiteDatabase(path, factory, flags);
}
@@ -1732,7 +1734,7 @@ public class SQLiteDatabase extends SQLiteClosable {
}
/* package */ void logTimeStat(boolean read, long begin, long end) {
EventLog.writeEvent(DB_OPERATION_EVENT, mPath, read ? 0 : 1, end - begin);
EventLog.writeEvent(EVENT_DB_OPERATION, mPath, read ? 0 : 1, end - begin);
}
/**