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

Merge change 8633

Browse Source 
* changes:
  Fix UnsupportedOperationException in AccountSetupBasic caused by Account.update() when !isSaved().
This commit is contained in:
Android (Google) Code Review 2009-07-27 12:46:38 -07:00
commit 63b2ad5bfb
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/email/activity/setup/AccountSetupBasics.java
View File

@ -303,12 +303,11 @@ public class AccountSetupBasics extends Activity
if (resultCode == RESULT_OK) { if (resultCode == RESULT_OK) {
String email = mAccount.getEmailAddress(); String email = mAccount.getEmailAddress();
boolean isDefault = mDefaultView.isChecked(); boolean isDefault = mDefaultView.isChecked();
mAccount.setDisplayName(mAccount.getEmailAddress()); mAccount.setDisplayName(email);
mAccount.setDefaultAccount(mDefaultView.isChecked()); mAccount.setDefaultAccount(isDefault);
ContentValues cv = new ContentValues(); // At this point we write the Account object to the DB for the first time.
cv.put(AccountColumns.DISPLAY_NAME, email); // From now on we'll only pass the accountId around.
cv.put(AccountColumns.IS_DEFAULT, isDefault); mAccount.save(this);
mAccount.update(this, cv);
Email.setServicesEnabled(this); Email.setServicesEnabled(this);
AccountSetupNames.actionSetNames(this, mAccount.mId); AccountSetupNames.actionSetNames(this, mAccount.mId);
finish(); finish();