Merge "Fix NPE in deleteDatabase()." into klp-modular-dev (df8b604e) · Commits · e / os / android_frameworks_base

core/java/android/database/sqlite/SQLiteDatabase.java

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -738,16 +738,18 @@ 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) {
			for (File masterJournal : files) {
	deleted \|= masterJournal.delete();		deleted \|= masterJournal.delete();
	}		}
	}		}
			}
	return deleted;		return deleted;
	}		}