ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some AOSP NPEs

Browse Source 
automerge: 473ce1f

* commit '473ce1fa354c81fd7d5bbd84b6a85d629a039e72':
  Fix some AOSP NPEs
This commit is contained in:
Tony Mantler 2014-11-02 07:09:21 +00:00 committed by android-build-merger
commit c71afebb39
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/email/provider/AccountReconciler.java
View File

@ -249,11 +249,11 @@ public class AccountReconciler {
final String protocol = EmailServiceUtils.getProtocolFromAccountType( final String protocol = EmailServiceUtils.getProtocolFromAccountType(
context, accountType); context, accountType);
final EmailServiceInfo info = EmailServiceUtils.getServiceInfo(context, protocol); final EmailServiceInfo info = EmailServiceUtils.getServiceInfo(context, protocol);
if (!info.syncCalendar) { if (info == null || !info.syncCalendar) {
ContentResolver.setIsSyncable(accountManagerAccount, ContentResolver.setIsSyncable(accountManagerAccount,
CalendarContract.AUTHORITY, 0); CalendarContract.AUTHORITY, 0);
} }
if (!info.syncContacts) { if (info == null || !info.syncContacts) {
ContentResolver.setIsSyncable(accountManagerAccount, ContentResolver.setIsSyncable(accountManagerAccount,
ContactsContract.AUTHORITY, 0); ContactsContract.AUTHORITY, 0);
} }

4
src/com/android/email/service/AuthenticatorService.java
View File

@ -73,7 +73,7 @@ public class AuthenticatorService extends Service {
account, options.getString(OPTIONS_PASSWORD), null); account, options.getString(OPTIONS_PASSWORD), null);
// Set up contacts syncing, if appropriate // Set up contacts syncing, if appropriate
if (info.syncContacts) { if (info != null && info.syncContacts) {
boolean syncContacts = options.getBoolean(OPTIONS_CONTACTS_SYNC_ENABLED, false); boolean syncContacts = options.getBoolean(OPTIONS_CONTACTS_SYNC_ENABLED, false);
ContentResolver.setIsSyncable(account, ContactsContract.AUTHORITY, 1); ContentResolver.setIsSyncable(account, ContactsContract.AUTHORITY, 1);
ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY,
@ -81,7 +81,7 @@ public class AuthenticatorService extends Service {
} }
// Set up calendar syncing, if appropriate // Set up calendar syncing, if appropriate
if (info.syncCalendar) { if (info != null && info.syncCalendar) {
boolean syncCalendar = options.getBoolean(OPTIONS_CALENDAR_SYNC_ENABLED, false); boolean syncCalendar = options.getBoolean(OPTIONS_CALENDAR_SYNC_ENABLED, false);
ContentResolver.setIsSyncable(account, CalendarContract.AUTHORITY, 1); ContentResolver.setIsSyncable(account, CalendarContract.AUTHORITY, 1);
ContentResolver.setSyncAutomatically(account, CalendarContract.AUTHORITY, ContentResolver.setSyncAutomatically(account, CalendarContract.AUTHORITY,