Merge "Initialize mDatabase on provider startup" into jb-ub-mail

This commit is contained in:
Marc Blank 2012-09-04 08:55:49 -07:00 committed by Android (Google) Code Review
commit 9765f7b284

View File

@ -1046,6 +1046,7 @@ public class EmailProvider extends ContentProvider {
@Override
public boolean onCreate() {
Context context = getContext();
// Initialize Uri's used throughout the app
EmailContent.init(context);
if (INTEGRITY_CHECK_URI == null) {
INTEGRITY_CHECK_URI = Uri.parse("content://" + EmailContent.AUTHORITY +
@ -1184,6 +1185,8 @@ public class EmailProvider extends ContentProvider {
matcher.addURI(EmailContent.AUTHORITY, "pickTrashFolder/#", ACCOUNT_PICK_TRASH_FOLDER);
matcher.addURI(EmailContent.AUTHORITY, "pickSentFolder/#", ACCOUNT_PICK_SENT_FOLDER);
}
// Open our database(s)
getDatabase(context);
return false;
}