Fix NPE from null Folder
Catch empty folder cursor in migrate() and log error message and continue as with other empty cursor handling in loop. Bug:15854046 Change-Id: I13c0a1909755f62f318d7c2b237adb03df68ba86
This commit is contained in:
parent
5f24f6f2e5
commit
5bcb36eb10
@ -136,6 +136,11 @@ public class EmailPreferenceMigrator extends BasePreferenceMigrator {
|
|||||||
try {
|
try {
|
||||||
if (folderCursor.moveToFirst()) {
|
if (folderCursor.moveToFirst()) {
|
||||||
folder = new Folder(folderCursor);
|
folder = new Folder(folderCursor);
|
||||||
|
} else {
|
||||||
|
LogUtils.e(LOG_TAG, "Empty folder cursor for mailbox %s",
|
||||||
|
LogUtils.sanitizeName(LOG_TAG,
|
||||||
|
account.settings.defaultInbox.toString()));
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
folderCursor.close();
|
folderCursor.close();
|
||||||
|
Loading…
Reference in New Issue
Block a user