diff options
author | Jeff Brown <jeffbrown@google.com> | 2014-01-28 00:13:27 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-28 00:13:27 +0000 |
commit | 548061e5b63913a71b5101e5887a87f818cffadd (patch) | |
tree | 5d4566a81863891cfdad388a2c4f6c8cda4ca323 /core/java/android/database | |
parent | d16c409e55e3d0fbe3e6d18ceca5806415ed1c92 (diff) | |
parent | df8b604e9bf49bcf9a620e4fe19ccf19c2c49487 (diff) | |
download | frameworks_base-548061e5b63913a71b5101e5887a87f818cffadd.zip frameworks_base-548061e5b63913a71b5101e5887a87f818cffadd.tar.gz frameworks_base-548061e5b63913a71b5101e5887a87f818cffadd.tar.bz2 |
am df8b604e: Merge "Fix NPE in deleteDatabase()." into klp-modular-dev
* commit 'df8b604e9bf49bcf9a620e4fe19ccf19c2c49487':
Fix NPE in deleteDatabase().
Diffstat (limited to 'core/java/android/database')
-rw-r--r-- | core/java/android/database/sqlite/SQLiteDatabase.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java index 60ccc61..433d5d1 100644 --- a/core/java/android/database/sqlite/SQLiteDatabase.java +++ b/core/java/android/database/sqlite/SQLiteDatabase.java @@ -738,14 +738,16 @@ public final class SQLiteDatabase extends SQLiteClosable { File dir = file.getParentFile(); if (dir != null) { final String prefix = file.getName() + "-mj"; - final FileFilter filter = new FileFilter() { + File[] files = dir.listFiles(new FileFilter() { @Override public boolean accept(File candidate) { return candidate.getName().startsWith(prefix); } - }; - for (File masterJournal : dir.listFiles(filter)) { - deleted |= masterJournal.delete(); + }); + if (files != null) { + for (File masterJournal : files) { + deleted |= masterJournal.delete(); + } } } return deleted; |