Commit Graph

2529 Commits

Author SHA1 Message Date
Makoto Onuki
4a1565fd7e am 5ab7ec71: Move a bare string to a resource.
Merge commit '5ab7ec7123b5aa6bc9f8fd7e59d2cdf27d716ef5' into froyo-plus-aosp

* commit '5ab7ec7123b5aa6bc9f8fd7e59d2cdf27d716ef5':
  Move a bare string to a resource.
2010-04-30 11:22:55 -07:00
Makoto Onuki
5ab7ec7123 Move a bare string to a resource.
Bug 2637666

Change-Id: I59cf5d2b30846604049d3f988b1003dd7d91ad6f
2010-04-30 09:21:04 -07:00
Marc Blank
44ae6d2fa2 am f2d43c39: Merge "Update unit tests for invitation creation" into froyo
Merge commit 'f2d43c39b4f46d560b5f9d331dd238be63abfcf2' into froyo-plus-aosp

* commit 'f2d43c39b4f46d560b5f9d331dd238be63abfcf2':
  Update unit tests for invitation creation
2010-04-29 20:23:57 -07:00
Marc Blank
f2d43c39b4 Merge "Update unit tests for invitation creation" into froyo 2010-04-29 20:19:07 -07:00
Kenny Root
91a800708a am 3cc3b89f: Import revised translations
Merge commit '3cc3b89fc458fbd2adfcba94b6eded0311e68022' into froyo-plus-aosp

* commit '3cc3b89fc458fbd2adfcba94b6eded0311e68022':
  Import revised translations
2010-04-29 15:43:23 -07:00
Kenny Root
3cc3b89fc4 Import revised translations
Change-Id: I1586d45f93b08b55010c3136ceacd798aab3df6b
2010-04-29 15:40:54 -07:00
Marc Blank
9294d8c030 Update unit tests for invitation creation
* Tests changed/added for exception/recurrence changes in CL50201

Bug: 2640878
Change-Id: I97e5557c198aa686d1705158f2c9087c1683590e
2010-04-29 11:03:37 -07:00
Marc Blank
220d910753 am 8ba07285: Use timezone in exception ics files
Merge commit '8ba07285336c34a1fa454b23c9d4c95af020fa00' into froyo-plus-aosp

* commit '8ba07285336c34a1fa454b23c9d4c95af020fa00':
  Use timezone in exception ics files
2010-04-29 10:48:39 -07:00
Marc Blank
8ba0728533 Use timezone in exception ics files
* Exchange seems to require time zone information in ics files containing
  event exceptions, although this is NOT the case for iCalendar, and appears
  not to conform to VCALENDAR specifications
* This causes exceptions to be placed on the wrong date or perhaps even
  ignored, depending on the circumstance
* This CL simply adds time zone information to all exception ics files

Bug: 2640878
Change-Id: Ibc614eb7a2c45e9e782b10be979d9892bbfc0029
2010-04-29 10:16:58 -07:00
Marc Blank
0d46f9f87c am 39e6d3ae: Fix concurrent modification exception
Merge commit '39e6d3aed05571a1200ea1983bd6db409e2ed2b7' into froyo-plus-aosp

* commit '39e6d3aed05571a1200ea1983bd6db409e2ed2b7':
  Fix concurrent modification exception
2010-04-29 09:28:51 -07:00
Marc Blank
39e6d3aed0 Fix concurrent modification exception
* Synchronize recently added call to releaseMailbox on sSyncLock

Bug: 2639210
Change-Id: Iaa1f2ed7cdc9cc0c306363487095ac5ccd02f9a3
2010-04-28 22:49:23 -07:00
Marc Blank
8048f0fef8 am 8917e52d: Fix regression that prevents calendar sync w/ new accounts
Merge commit '8917e52db0a872dc6438f0055669d2393febfbb7' into froyo-plus-aosp

* commit '8917e52db0a872dc6438f0055669d2393febfbb7':
  Fix regression that prevents calendar sync w/ new accounts
2010-04-28 17:21:08 -07:00
Marc Blank
8917e52db0 Fix regression that prevents calendar sync w/ new accounts
* The regression is caused by a check on whether the calendar is
  syncable, as determined by the status of the Calendar (via
  CalendarProvider2).
* Unfortunately, if there IS no calendar, we were disallowing sync,
  which prevents the calendar from being created in the first place

Bug: 2619755
Change-Id: I1e94a129413bdbe9bc9bfb3608d3ca95f23d8dfb
2010-04-28 15:27:11 -07:00
Marc Blank
7e8315c018 am b7f57f25: Remove STOPSHIP debug code
Merge commit 'b7f57f25ea0baa3b111dafca3a96f532a12fac97' into froyo-plus-aosp

* commit 'b7f57f25ea0baa3b111dafca3a96f532a12fac97':
  Remove STOPSHIP debug code
2010-04-28 09:58:47 -07:00
Marc Blank
b7f57f25ea Remove STOPSHIP debug code
Bug: 2638014
Change-Id: I10a7ac89cce68ae1db146eb9bed574c00386ba62
2010-04-28 09:48:40 -07:00
Marc Blank
773dc43cc2 am b5bf09a5: Merge "Allow more time for HttpPost watchdog timeout" into froyo
Merge commit 'b5bf09a56d30885f985950faa1daa18e8899c32e' into froyo-plus-aosp

* commit 'b5bf09a56d30885f985950faa1daa18e8899c32e':
  Allow more time for HttpPost watchdog timeout
2010-04-28 09:32:24 -07:00
Marc Blank
8ed23be08f am f7369ad5: Merge "Shutdown all connections when sync service is hung" into froyo
Merge commit 'f7369ad51f0eb2c231715975de13e4af37c58eb4' into froyo-plus-aosp

* commit 'f7369ad51f0eb2c231715975de13e4af37c58eb4':
  Shutdown all connections when sync service is hung
2010-04-28 09:32:21 -07:00
Andy Stadler
78d3c6022c am b915c3c0: Merge "Skip security check when account id is unknown." into froyo
Merge commit 'b915c3c018c8c4ba063514c3bd9ce05d3f08aa93' into froyo-plus-aosp

* commit 'b915c3c018c8c4ba063514c3bd9ce05d3f08aa93':
  Skip security check when account id is unknown.
2010-04-28 09:32:10 -07:00
Marc Blank
b5bf09a56d Merge "Allow more time for HttpPost watchdog timeout" into froyo 2010-04-27 23:25:15 -07:00
Marc Blank
f7369ad51f Merge "Shutdown all connections when sync service is hung" into froyo 2010-04-27 23:17:41 -07:00
Marc Blank
8f9e872eaf Allow more time for HttpPost watchdog timeout
* The current timeout is triggering more often than it should, which
  causes delays and inefficiency.  Increase it from 10 to 30 seconds.

Bug: 2615293
Change-Id: I54b74cc7ad9f1c8286af49b957584670c071640c
2010-04-27 23:13:32 -07:00
Marc Blank
2341e096e6 Shutdown all connections when sync service is hung
* When a sync thread receives an alarm due to a missed socket timeout
  on an HttpPost, we try to abort the HttpPost.
* At times, however, the HttpPost cannot be aborted and the thread
  hangs indefinitely.
* In this CL, we try to break this vicious cycle by shutting down our
  ClientConnectionManager when this case is detected.  This should, in
  turn, close all of our socket connections, causing the sync threads
  to generate IOExceptions and terminate.
* After appropriate IOException waits, new sync threads should then be
  able to run normally.

Bug: 2615293
Change-Id: Idea6c3653cd60822d6260e0c5a7dad790ee25858
2010-04-27 22:49:50 -07:00
Andy Stadler
b915c3c018 Merge "Skip security check when account id is unknown." into froyo 2010-04-27 22:21:00 -07:00
Makoto Onuki
e333b68c9e Skip security check when account id is unknown.
Doing the check caused:
   IllegalArgumentException: Unknown URI content://com.android.email.provider/account/-1
       at com.android.email.provider.EmailProvider.query(EmailProvider.java:1092)
       at android.content.ContentProvider$Transport.query(ContentProvider.java:163)
       at android.content.ContentResolver.query(ContentResolver.java:245)
       at com.android.email.activity.MessageList.isSecurityHold(MessageList.java:1146)

Bug 2635060

Change-Id: I80e7c00ef2dd74ceae24a88daf43a0681124a9d4
2010-04-27 17:28:39 -07:00
Kenny Root
5a705d632a am 4713110b: Merge "Import revised translations" into froyo
Merge commit '4713110b02195dbe5cba41d012a0a432f8460c55' into froyo-plus-aosp

* commit '4713110b02195dbe5cba41d012a0a432f8460c55':
  Import revised translations
2010-04-27 15:26:15 -07:00
Kenny Root
4713110b02 Merge "Import revised translations" into froyo 2010-04-27 15:23:51 -07:00
Kenny Root
178e51fcd8 Import revised translations
Change-Id: Ic6ff953da67dceea3631416546fa44e9b0949ae6
2010-04-27 13:35:56 -07:00
Marc Blank
29270f3823 am 422ceb0e: Merge "Don\'t enable calendar sync if sync_events is disabled" into froyo
Merge commit '422ceb0efd3d1605e6a9d8b25f408cbdd85bfc15' into froyo-plus-aosp

* commit '422ceb0efd3d1605e6a9d8b25f408cbdd85bfc15':
  Don't enable calendar sync if sync_events is disabled
2010-04-27 12:03:02 -07:00
Marc Blank
422ceb0efd Merge "Don't enable calendar sync if sync_events is disabled" into froyo 2010-04-27 11:59:33 -07:00
Marc Blank
f62f4afff1 Don't enable calendar sync if sync_events is disabled
* When SyncManager starts up, it reconciles the AccountManager sync settings
  with its own
* This works for Contacts, but Calendar has a second setting that needs to be
  checked - the sync_events column in the Calendar table (in CalendarProvider2)
* Before turning on Calendar sync, we now check this second setting; if
  sync_events is 0, we won't re-enable Calendar sync

Bug: 2619755
Change-Id: Iea6c99dce228d2c111a529a6c9b865ed1577b19e
2010-04-26 13:25:48 -07:00
Marc Blank
d718abd38c am b62cbc7e: Increase service call timeout to 45 seconds
Merge commit 'b62cbc7e7b82739c307b5cb3175bbfff5f549295' into froyo-plus-aosp

* commit 'b62cbc7e7b82739c307b5cb3175bbfff5f549295':
  Increase service call timeout to 45 seconds
2010-04-26 10:08:21 -07:00
Marc Blank
cebb801ace am da71abeb: Improve sync thread alerting mechanism
Merge commit 'da71abeb8f0b0bce9de837d6614bcbc8ad7a39c6' into froyo-plus-aosp

* commit 'da71abeb8f0b0bce9de837d6614bcbc8ad7a39c6':
  Improve sync thread alerting mechanism
2010-04-26 10:08:12 -07:00
Marc Blank
17733f228e am 0f686768: Merge "Fix upsync of DAILY rrule with UNTIL" into froyo
Merge commit '0f68676828d1f66c7997a0457f1c6536e661658f' into froyo-plus-aosp

* commit '0f68676828d1f66c7997a0457f1c6536e661658f':
  Fix upsync of DAILY rrule with UNTIL
2010-04-26 10:08:10 -07:00
Marc Blank
aaa9c6a4d1 am d8d3719f: Tweak NAT timeout behavior
Merge commit 'd8d3719f34fa2dde9312d3156f7eccfe0fef0584' into froyo-plus-aosp

* commit 'd8d3719f34fa2dde9312d3156f7eccfe0fef0584':
  Tweak NAT timeout behavior
2010-04-26 10:08:00 -07:00
Marc Blank
b62cbc7e7b Increase service call timeout to 45 seconds
Bug: 2627273
Change-Id: I971aa271cfc03e669e72f7871856cb9cfc10aa14
2010-04-26 08:14:01 -07:00
Marc Blank
da71abeb8f Improve sync thread alerting mechanism
* When a sync thread triggers an alarm by failing to return from
  an HttpPost beyond the socket timeout, we call abort() on the
  HttpPost to force it to stop
* It appears that there are cases in which this is insufficient,
  and the thread remains hung in a blocked state
* The result of this failure is to prevent the syncing mailbox from
  ever syncing again, and is typically seen by a failure to receive
  new mail (as reported in the referenced bug)
* In this CL, we add code to wait for 10 seconds after calling the
  abort() method.  If the HttpPost is still hung, we interrupt() the
  thread, and have SyncManager release the Mailbox, so that another
  thread can be started.

Bug: 2615293
Change-Id: I6a48195fc68bb950126006326a5b30448d3bbb63
2010-04-26 07:06:56 -07:00
Marc Blank
0f68676828 Merge "Fix upsync of DAILY rrule with UNTIL" into froyo 2010-04-25 20:27:54 -07:00
Marc Blank
47d124e4a1 Fix upsync of DAILY rrule with UNTIL
* Make sure we send UNTIL with FREQ=DAILY as appropriate
* Also to help debug this in the future...
    Add logging capability to utilities via SyncManager
    Add public log methods so that CalendarUtilities can log properly
    Change Log.d's to SyncManager.log in CalendarUtilities

Bug: 2623787
Change-Id: I3d651f00a3f7522e25c8d6e389469770c733953f
2010-04-24 13:05:16 -07:00
Marc Blank
d8d3719f34 Tweak NAT timeout behavior
* Change "broken pipe" behavior to simply run through the ping loop
  again, rather than be treated as a NAT timeout

Bug: 2615293
Change-Id: I67c3200f148a8c2beda58f812c29af8a726a4b9c
2010-04-24 10:39:06 -07:00
Marc Blank
f1fa44bdc0 am 2f1ce56f: Merge "Fix upload/download of attendee status" into froyo
Merge commit '2f1ce56fc85e8dc7052dc16f58d00bf19b2a9bee' into froyo-plus-aosp

* commit '2f1ce56fc85e8dc7052dc16f58d00bf19b2a9bee':
  Fix upload/download of attendee status
2010-04-23 17:24:20 -07:00
Marc Blank
b11ea045e9 am 7cb5e144: Merge "Add checks for null in SyncManager" into froyo
Merge commit '7cb5e144e746b5310d8f9facc24ab992f1a2a67c' into froyo-plus-aosp

* commit '7cb5e144e746b5310d8f9facc24ab992f1a2a67c':
  Add checks for null in SyncManager
2010-04-23 17:21:46 -07:00
Marc Blank
2f1ce56fc8 Merge "Fix upload/download of attendee status" into froyo 2010-04-23 17:21:41 -07:00
Marc Blank
7cb5e144e7 Merge "Add checks for null in SyncManager" into froyo 2010-04-23 17:19:32 -07:00
Andrew Stadler
da0fb1784c am 5ac8a35c: Merge "Fix uncommanded exit from MessageList with 2+ accounts" into froyo
Merge commit '5ac8a35c4290d9e3ce22eb28341214189a40fc6c' into froyo-plus-aosp

* commit '5ac8a35c4290d9e3ce22eb28341214189a40fc6c':
  Fix uncommanded exit from MessageList with 2+ accounts
2010-04-23 13:34:23 -07:00
Andrew Stadler
5ac8a35c42 Merge "Fix uncommanded exit from MessageList with 2+ accounts" into froyo 2010-04-23 13:30:48 -07:00
Marc Blank
819de68b01 am de3ae172: Merge "Add additional test for likely NAT timeout" into froyo
Merge commit 'de3ae17246bc011eff61e18ee1013e146ec53a3d' into froyo-plus-aosp

* commit 'de3ae17246bc011eff61e18ee1013e146ec53a3d':
  Add additional test for likely NAT timeout
2010-04-23 12:45:55 -07:00
Marc Blank
de3ae17246 Merge "Add additional test for likely NAT timeout" into froyo 2010-04-23 12:42:30 -07:00
Andrew Stadler
88fb7f7cd0 Fix uncommanded exit from MessageList with 2+ accounts
* When you have 2 or more accounts configured, MessageList gets confused.
* If you are viewing a mailbox from account A, and account B does a
  background sync, MessageList gets confused by the reports coming back
  from the Controller.  It gives up and returns to the Accounts list.
* This change adds a check for the current account and ignores the
  MessageList updates if we weren't actually waiting for them.
* To test the positive case for this code (make sure we didn't break it),
  verify that the inbox on an IMAP account is displayed properly
  immediately after you add it.

Bug: 2619513
Change-Id: Ib31254b4099ba6b7922b06d42e2b7928551e4fb2
2010-04-23 12:17:43 -07:00
Marc Blank
bc27894815 Add additional test for likely NAT timeout
* This prevents unnecessary delays in receiving push mail
* At present, there is a likely 5 minute delay on receiving new pushed
  mail on the network displaying the behavior we're testing for

Bug: 2615293
Change-Id: Ic42e576fa683790f96434fcbad5ee873d0730f6d
2010-04-23 10:53:21 -07:00
Marc Blank
8a19af3739 Fix upload/download of attendee status
* It turns out that the UI uses selfAttendeeStatus and the attendee's status
  from the Attendees table in confusing and undocumented ways
* selfAttendeeStatus is used in the UI, but only in certain cases. Generally speaking,
  the Attendees table status is definitive.  However, when the user sets his status
  from the UI, this data is reflected in the event's selfAttendeeStatus, since for EAS,
  the user is always the owner of his calendar
* On downsync,  we'll put the user's busy status into the Attendees table
* On upsync, we'll send busy status based on the user's attendee status in the
  Attendees table
* We'll use selfAttendeeStatus only to determine whether the user has manually changed
  his status via the UI (as before)

Bug: 2615586
Change-Id: I3a82474cfd07cbf5aa595e5214807cb55005cefa
2010-04-23 09:07:53 -07:00