Initial support for Exchange account creation via AccountManager
* Export AccountSetupBasics so that it can be launched by AccountManager
* Update EasAuthenticatorService to return an Intent for AccountSetupBasics
* UI needs to be updated to skip account type screen, change welcome, etc.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e685bd9..807111a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -49,9 +49,11 @@
</intent-filter>
</activity>
+ <!-- Must be exported in order for the AccountManager to launch it -->
<activity
android:name=".activity.setup.AccountSetupBasics"
android:label="@string/account_setup_basics_title"
+ android:exported="true"
>
</activity>
<activity
diff --git a/src/com/android/exchange/SyncManager.java b/src/com/android/exchange/SyncManager.java
index b9c835a..8c33023 100644
--- a/src/com/android/exchange/SyncManager.java
+++ b/src/com/android/exchange/SyncManager.java
@@ -455,7 +455,8 @@
@Override
public void onCreate() {
if (INSTANCE != null) {
- throw new RuntimeException("\n************ ALREADY RUNNING *************\n");
+ Log.d(TAG, "onCreate called on running SyncManager");
+ return;
}
INSTANCE = this;
@@ -480,9 +481,6 @@
MailboxColumns.TYPE + "=?",
new String[] {Long.toString(accountId),
Long.toString(Mailbox.TYPE_EAS_ACCOUNT_MAILBOX)}, null);
- //sCallbackProxy.syncMailboxListStatus(accountId, EmailServiceStatus.IN_PROGRESS, 0);
- //sCallbackProxy.syncMailboxListStatus(accountId, EmailServiceStatus.SUCCESS, 0);
- // TODO Remove previous two lines; reimplement what's below (this is bug #2026451)
try {
if (c.moveToFirst()) {
synchronized(mSyncToken) {
