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

am ecd23cf0: Check amProtocol for empty before assuming the user picked a different protocol 

* commit 'ecd23cf0f29c10c11c6af5022de81be7757b6017':
  Check amProtocol for empty before assuming the user picked a different protocol
This commit is contained in:
Tony Mantler 2014-04-02 22:57:06 +00:00 committed by Android Git Automerger
parent 08f73de89d ecd23cf0f2
commit 77c20133ba
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/email/activity/setup/AccountSetupFinal.java
View File

@ -543,8 +543,9 @@ public class AccountSetupFinal extends AccountSetupActivity
} else {
mSkipAutoDiscover = false;
if (mIsPreConfiguredProvider) {
if (!TextUtils.equals(mSetupData.getAmProtocol(),
mSetupData.getIncomingProtocol(this))) {
if (!TextUtils.isEmpty(mSetupData.getAmProtocol()) &&
!TextUtils.equals(mSetupData.getAmProtocol(),
mSetupData.getIncomingProtocol(this))) {
mState = STATE_AB;
} else {
mState = STATE_CREDENTIALS;