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

am c1ff8195: Merge "Read protocol version from validation bundle." into jb-ub-mail-ur9 

* commit 'c1ff8195f6baf3c3ce4f1b2329a45f10944e2820':
  Read protocol version from validation bundle.
This commit is contained in:
Yu Ping Hu 2013-05-17 17:59:33 -07:00 committed by Android Git Automerger
parent dc33c30e3d c1ff8195f6
commit e70d3660d8
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
emailcommon/src/com/android/emailcommon/service/EmailServiceProxy.java
View File

@ -59,6 +59,7 @@ public class EmailServiceProxy extends ServiceProxy implements IEmailService {
public static final String VALIDATE_BUNDLE_ERROR_MESSAGE = "validate_error_message";
public static final String VALIDATE_BUNDLE_UNSUPPORTED_POLICIES =
"validate_unsupported_policies";
public static final String VALIDATE_BUNDLE_PROTOCOL_VERSION = "validate_protocol_version";
private final IEmailServiceCallback mCallback;
private Object mReturn = null;

2
src/com/android/email/activity/setup/AccountCheckSettingsFragment.java
View File

@ -473,6 +473,8 @@ public class AccountCheckSettingsFragment extends Fragment {
Bundle bundle = store.checkSettings();
int resultCode = MessagingException.UNSPECIFIED_EXCEPTION;
if (bundle != null) {
mAccount.mProtocolVersion = bundle.getString(
EmailServiceProxy.VALIDATE_BUNDLE_PROTOCOL_VERSION);
resultCode = bundle.getInt(
EmailServiceProxy.VALIDATE_BUNDLE_RESULT_CODE);
// Only show "policies required" if this is a new account setup