Merge "Synchronize access to our cached account list" into froyo
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 198c9dd..a21a23d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -170,6 +170,23 @@
<action android:name="android.intent.action.MAIN" />
</intent-filter>
</activity>
+
+ <!--
+ This activity catches shortcuts to account created on Android 1.6 and before,
+ and redirects to MessageList.
+ singleTask is necessary to make sure the activity is really launched.
+ Without it, the framework brings up the app to front, but doesn't necessarily
+ launch the activity.
+ -->
+ <activity
+ android:name=".activity.FolderMessageList"
+ android:launchMode="singleTask"
+ >
+ <intent-filter>
+ <!-- This action is only to allow an entry point for launcher shortcuts -->
+ <action android:name="android.intent.action.MAIN" />
+ </intent-filter>
+ </activity>
<activity
android:name=".activity.MessageView"
diff --git a/src/com/android/exchange/adapter/CalendarSyncAdapter.java b/src/com/android/exchange/adapter/CalendarSyncAdapter.java
index 8288149..78152a0 100644
--- a/src/com/android/exchange/adapter/CalendarSyncAdapter.java
+++ b/src/com/android/exchange/adapter/CalendarSyncAdapter.java
@@ -535,7 +535,7 @@
cv.put(Events.ORIGINAL_ALL_DAY, parentCv.getAsInteger(Events.ALL_DAY));
cv.put(Events.EVENT_LOCATION, parentCv.getAsString(Events.EVENT_LOCATION));
cv.put(Events.VISIBILITY, parentCv.getAsString(Events.VISIBILITY));
- cv.put(Events.TIMEZONE, parentCv.getAsString(Events.TIMEZONE));
+ cv.put(Events.EVENT_TIMEZONE, parentCv.getAsString(Events.EVENT_TIMEZONE));
// This column is the key that links the exception to the serverId
// TODO Make sure calendar knows this isn't globally unique!!
