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

b/13734367

Change-Id: I36514cedc31f9a02c627e921b37fdb500d0ab74c
This commit is contained in:
Tony Mantler 2014-03-31 16:43:14 -07:00
parent 3b6b9172e4
commit ecd23cf0f2

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;