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

Merge "Fix NPE in deleteDatabase()." into klp-modular-dev

Browse Source
This commit is contained in:
Jeff Brown
2014-01-28 00:09:42 +00:00
committed by Android (Google) Code Review
parent 065d998a4c fce5890a11
commit df8b604e9b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -738,14 +738,16 @@ public final class SQLiteDatabase extends SQLiteClosable {
File dir = file.getParentFile(); File dir = file.getParentFile();
if (dir != null) { if (dir != null) {
final String prefix = file.getName() + "-mj"; final String prefix = file.getName() + "-mj";
final FileFilter filter = new FileFilter() { File[] files = dir.listFiles(new FileFilter() {
@Override @Override
public boolean accept(File candidate) { public boolean accept(File candidate) {
return candidate.getName().startsWith(prefix); return candidate.getName().startsWith(prefix);
} }
}; });
for (File masterJournal : dir.listFiles(filter)) { if (files != null) {
deleted |= masterJournal.delete(); for (File masterJournal : files) {
deleted |= masterJournal.delete();
}
} }
} }
return deleted; return deleted;