Merge commit 'e1145d173971ebe741e42e9caa209ef2f7bbefa4' into eclair-plus-aosp * commit 'e1145d173971ebe741e42e9caa209ef2f7bbefa4': In EAS flow mode, don't try to use auto-setup (fixes #2143583)
This commit is contained in:
commit
215f76aa95
@ -344,25 +344,23 @@ public class AccountSetupBasics extends Activity
|
||||
}
|
||||
|
||||
private void onNext() {
|
||||
// If this is EAS flow, don't try to find a provider for the domain!
|
||||
if (!mEasFlowMode) {
|
||||
String email = mEmailView.getText().toString().trim();
|
||||
String[] emailParts = email.split("@");
|
||||
String domain = emailParts[1].trim();
|
||||
mProvider = findProviderForDomain(domain);
|
||||
if (mProvider == null) {
|
||||
/*
|
||||
* We don't have default settings for this account, start the manual
|
||||
* setup process.
|
||||
*/
|
||||
onManualSetup();
|
||||
return;
|
||||
}
|
||||
|
||||
if (mProvider != null) {
|
||||
if (mProvider.note != null) {
|
||||
showDialog(DIALOG_NOTE);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
finishAutoSetup();
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
// Can't use auto setup
|
||||
onManualSetup();
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user