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

com.android.mail.providers.Account contructors are no longer public 

and clients need to use Account.builder().buildFrom(...) instead.

Change-Id: I7559540458ae549c399effc59392930ec914ffcc
This commit is contained in:
Ray Chen 2014-07-11 17:17:54 +02:00
parent 845001d250
commit 7e75afadb1
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/email/NotificationController.java
View File

@ -331,7 +331,7 @@ public class NotificationController {
com.android.mail.providers.Account uiAccount = null; com.android.mail.providers.Account uiAccount = null;
try { try {
if (accountCursor.moveToFirst()) { if (accountCursor.moveToFirst()) {
uiAccount = new com.android.mail.providers.Account(accountCursor); uiAccount = com.android.mail.providers.Account.builder().buildFrom(accountCursor);
} }
} finally { } finally {
accountCursor.close(); accountCursor.close();
@ -671,7 +671,7 @@ public class NotificationController {
com.android.mail.providers.Account account = null; com.android.mail.providers.Account account = null;
try { try {
if (accountCursor.moveToFirst()) { if (accountCursor.moveToFirst()) {
account = new com.android.mail.providers.Account(accountCursor); account = com.android.mail.providers.Account.builder().buildFrom(accountCursor);
} }
} finally { } finally {
accountCursor.close(); accountCursor.close();

3
src/com/android/email/activity/setup/AccountSettingsFragment.java
View File

@ -210,6 +210,7 @@ public class AccountSettingsFragment extends MailAccountPrefsFragment
} }
} }
@Override
public void onSaveInstanceState(Bundle outstate) { public void onSaveInstanceState(Bundle outstate) {
super.onSaveInstanceState(outstate); super.onSaveInstanceState(outstate);
if (mCheckFrequency != null) { if (mCheckFrequency != null) {
@ -459,7 +460,7 @@ public class AccountSettingsFragment extends MailAccountPrefsFragment
} }
final com.android.mail.providers.Account uiAccount = final com.android.mail.providers.Account uiAccount =
new com.android.mail.providers.Account(uiAccountCursor); com.android.mail.providers.Account.builder().buildFrom(uiAccountCursor);
map.put(RESULT_KEY_UIACCOUNT, uiAccount); map.put(RESULT_KEY_UIACCOUNT, uiAccount);

2
src/com/android/email/preferences/EmailPreferenceMigrator.java
View File

@ -57,7 +57,7 @@ public class EmailPreferenceMigrator extends BasePreferenceMigrator {
} else { } else {
try { try {
while (accountCursor.moveToNext()) { while (accountCursor.moveToNext()) {
accounts.add(new Account(accountCursor)); accounts.add(Account.builder().buildFrom(accountCursor));
} }
} finally { } finally {
accountCursor.close(); accountCursor.close();

2
src/com/android/email/provider/EmailProvider.java
View File

@ -5402,7 +5402,7 @@ public class EmailProvider extends ContentProvider
try { try {
if (ac.moveToFirst()) { if (ac.moveToFirst()) {
final com.android.mail.providers.Account uiAccount = final com.android.mail.providers.Account uiAccount =
new com.android.mail.providers.Account(ac); com.android.mail.providers.Account.builder().buildFrom(ac);
Intent intent = new Intent(context, FolderPickerActivity.class); Intent intent = new Intent(context, FolderPickerActivity.class);
intent.putExtra(PICKER_UI_ACCOUNT, uiAccount); intent.putExtra(PICKER_UI_ACCOUNT, uiAccount);
intent.putExtra(PICKER_MAILBOX_TYPE, type); intent.putExtra(PICKER_MAILBOX_TYPE, type);

2
src/com/android/email/provider/WidgetProvider.java
View File

@ -159,7 +159,7 @@ public class WidgetProvider extends BaseWidgetProvider {
com.android.mail.providers.Account uiAccount = null; com.android.mail.providers.Account uiAccount = null;
try { try {
if (accountCursor.moveToFirst()) { if (accountCursor.moveToFirst()) {
uiAccount = new com.android.mail.providers.Account(accountCursor); uiAccount = com.android.mail.providers.Account.builder().buildFrom(accountCursor);
} }
} finally { } finally {
accountCursor.close(); accountCursor.close();

2
src/com/android/email2/ui/MailActivityEmail.java
View File

@ -231,7 +231,7 @@ public class MailActivityEmail extends com.android.mail.ui.MailActivity {
com.android.mail.providers.Account account = null; com.android.mail.providers.Account account = null;
try { try {
if (accountCursor.moveToFirst()) { if (accountCursor.moveToFirst()) {
account = new com.android.mail.providers.Account(accountCursor); account = com.android.mail.providers.Account.builder().buildFrom(accountCursor);
} }
} finally { } finally {
accountCursor.close(); accountCursor.close();