Commit Graph

3745 Commits

Author SHA1 Message Date
Andrew Stadler
bf567c81c1 am aae1f83a: am 89a799c8: (-s ours) DO NOT MERGE: Don\'t disable account box if sync freq -> "Never"
* commit 'aae1f83ad10aef8ac6379c10ee88c34268a33817':
  DO NOT MERGE: Don't disable account box if sync freq -> "Never"
2010-10-29 16:21:39 -07:00
Andrew Stadler
aae1f83ad1 am 89a799c8: (-s ours) DO NOT MERGE: Don\'t disable account box if sync freq -> "Never"
* commit '89a799c8d4e9b44c2cf5ba6e72f17e1bb652c42b':
  DO NOT MERGE: Don't disable account box if sync freq -> "Never"
2010-10-29 16:19:14 -07:00
Andrew Stadler
9031e67b7e Fix remote wipe with mobile sync server DO NOT MERGE
* It appears as if our running multiple sync threads can confuse the
  mobile sync server during a remote wipe (the server expects the next
  client response to be an acknowledgment, whereas it might well be
  a command or response from a different thread)
* To avoid this, we first put the account on security hold and then
  shut down all other sync threads for the account
* After this, we send the acknowledgment and the remote wipe proceeds
  normally.
* NOTE: It's possible that, due to the vagaries of multithreaded
  operation, one of the other syncing threads could still send a non-
  acknowledgment response to the server before our provisioning thread
  gets a chance to send its acknowledgment.  However, since the other
  syncing threads will terminate (and not restart, because of the hold),
  the provision/remote wipe/ack sequence will work on the subsequent
  attempt

Bug: 2844888
Backport From: Ib4ffbbc67b681e69176b6c1d5515fa80c7d1e121
Backport From: Ie9e944bd39f331c2ddc0f0ba303a3d5684f6f033

Change-Id: Ie57f13a5ca2149961a48b99afaebb812f1cbc88e
2010-10-29 16:18:44 -07:00
Andrew Stadler
eae2a6806b am b7a7931d: (-s ours) am 90e22765: am 3ddfdb8e: (-s ours) Merge "Give email its own version# scheme. DO NOT MERGE" into froyo
* commit 'b7a7931db02bed498147e47df940361e177213f3':
  Give email its own version# scheme.  DO NOT MERGE
2010-10-29 16:18:33 -07:00
Andrew Stadler
89a799c8d4 DO NOT MERGE: Don't disable account box if sync freq -> "Never"
Original Change-Id: Iec214b0fed093ff39dc70d5d821577bcf15f00ed
Bug: 2905667

Change-Id: Iee182596d8c217d6bd78371fcf6fdc4dbfcd04a4
2010-10-29 16:16:40 -07:00
Andrew Stadler
77e005f62f am 53881237: (-s ours) am ac6e846c: am bafd3d87: (-s ours) Increase EAS command timeout from 20 to 30 seconds DO NOT MERGE
* commit '53881237b2ed37df133c4e11d173b5f703e2aa30':
  Increase EAS command timeout from 20 to 30 seconds DO NOT MERGE
2010-10-29 16:16:31 -07:00
Andrew Stadler
b7a7931db0 am 90e22765: am 3ddfdb8e: (-s ours) Merge "Give email its own version# scheme. DO NOT MERGE" into froyo
* commit '90e227650c58407176ea0cab7e315ebb294a3bf7':
  Give email its own version# scheme.  DO NOT MERGE
2010-10-29 16:16:23 -07:00
Andrew Stadler
53881237b2 am ac6e846c: am bafd3d87: (-s ours) Increase EAS command timeout from 20 to 30 seconds DO NOT MERGE
* commit 'ac6e846c10464b48deb85f320dc8f9b02e76d3a6':
  Increase EAS command timeout from 20 to 30 seconds DO NOT MERGE
2010-10-29 16:14:29 -07:00
Andrew Stadler
90e227650c am 3ddfdb8e: (-s ours) Merge "Give email its own version# scheme. DO NOT MERGE" into froyo
* commit '3ddfdb8e075f57184954a2000e71f70922ab7bd9':
  Give email its own version# scheme.  DO NOT MERGE
2010-10-29 16:14:11 -07:00
Andrew Stadler
ac6e846c10 am bafd3d87: (-s ours) Increase EAS command timeout from 20 to 30 seconds DO NOT MERGE
* commit 'bafd3d871530335ef47b7b33b984b6bff0df91fa':
  Increase EAS command timeout from 20 to 30 seconds DO NOT MERGE
2010-10-29 16:12:19 -07:00
Andrew Stadler
3ddfdb8e07 Merge "Give email its own version# scheme. DO NOT MERGE" into froyo 2010-10-29 16:11:12 -07:00
Andrew Stadler
7ecf6d5ca8 Give email its own version# scheme. DO NOT MERGE
Backport From: I258ffcf47d243417edadad44714f74247c78b366

Change-Id: I66dcce11bfaa5bec6d2936aafeb4fde43eafb2c0
2010-10-29 14:17:49 -07:00
Andrew Stadler
bafd3d8715 Increase EAS command timeout from 20 to 30 seconds DO NOT MERGE
Original Change-Id: Ic58fea147d179ffd18f28a8ce5d290a1b37302ce
Bug: 3027271

Change-Id: I86cd297f3273b20bd21fcca534eb58b39f904965
2010-10-29 14:07:50 -07:00
Andrew Stadler
34e6205d44 Simplify setupSyncReportsLocked
* Remove three unneeded DB lookups
* Eliminate race condition that could cause NPE
* Remove protocol field from report, it wasn't needed (we already
  set the sync interval to -1 which has the same effect.)

Note, the problems were introduced unintentionally, due to the merged
result of three different CL's:
 I168b3db49bf422b33d05f25cfff1c7be15150c2b
 I74a3dae21d9ec16f9903bdf2a1c28092ae89cc50
 I53e935f8bf08e0bda6e2cd483229a6377ed39d74

Bug: 3139451
Change-Id: Iadbed267f88808aeace0a2f011e4acf79074af70
2010-10-29 11:38:28 -07:00
Marc Blank
828ad13c15 Merge "Ensure that finishBroadcast is called in broadcastCallbacks" 2010-10-29 08:03:32 -07:00
Marc Blank
b961c78ff4 Harden AttachmentDownloadService
* It's possible that endDownload will be called for a request
  that has been dequeued.
* Harden endDownload against this eventuality, so that we clean
  up properly without throwing exceptions

Bug: 3142618
Change-Id: If61136ed1ea972248fc5f9388beaaf84754f9931
2010-10-28 17:21:28 -07:00
Marc Blank
4f1480369c Ensure that finishBroadcast is called in broadcastCallbacks
* An unexpected (runtime) exception during a callback left the
  broadcast unfinished, leading to a fatal exception
* Ensure that we always call finishBroadcast()
* Catch RuntimeException in a broadcast call, so that other calls
  can be executed
* Addresses one of two issues in the referenced bug

Bug: 3142618
Change-Id: I77166bf927560681a2b189906cd687a6e3585223
2010-10-28 17:00:35 -07:00
Eric Fischer
02f5a84ee3 Import revised translations.
Change-Id: I21bfef5a27492a444b6f4cbe16e5e07b6fddd51b
2010-10-28 14:09:13 -07:00
Eric Fischer
07f06fd9ad Merge "Fix string formatting mistake that put "new" outside its <item /> block." 2010-10-28 10:09:42 -07:00
Marc Blank
affe44f14c Merge "Revert "Fix strict mode violation in maybeStartExchangeServiceThread"" 2010-10-27 17:14:52 -07:00
Marc Blank
f74e2578aa Merge "Revert "Correct strict-mode fix CL"" 2010-10-27 17:14:40 -07:00
Marc Blank
13fe88f38d Revert "Fix strict mode violation in maybeStartExchangeServiceThread"
This reverts commit 0e1ffb033a.
2010-10-27 17:13:53 -07:00
Marc Blank
dac9c15266 Revert "Correct strict-mode fix CL"
This reverts commit 87a7f84580.
2010-10-27 17:12:49 -07:00
Andrew Stadler
4f71ade96e Remove BOOT_COMPLETED log.
Change-Id: I3eb06076ad61dab0f38e32e736e7dbbcf8dde065
2010-10-27 16:19:55 -07:00
Eric Fischer
b6fca2da16 Fix string formatting mistake that put "new" outside its <item /> block.
Change-Id: Ibab67771d76c8af9ffecb5f3729808d47a225b1e
2010-10-27 15:48:57 -07:00
Makoto Onuki
d7642bfbe9 Turn on ActionBar on the 1-pane message list
We'll have both the action bar and the title bar, but we need the action bar
to access menu commands.  This is necessary to make sure phone UI hasn't
been broken.

Change-Id: I5f6f72934d0346cbb01bdd98d31ba19ee0458aef
2010-10-27 15:04:07 -07:00
Marc Blank
87a7f84580 Correct strict-mode fix CL
Change-Id: I233b77ec02d0b9519b4dba57458b1b5cf9a97561
2010-10-27 09:32:59 -07:00
Marc Blank
45b15734d8 Merge "Delete secured accounts if device admin is disabled" 2010-10-27 09:03:39 -07:00
Marc Blank
02d59d2194 Delete secured accounts if device admin is disabled
* Update unit test

Bug: 2817683
Change-Id: Ia7117c34e7bbba13ac4f2ff375d19b3ef94ef49c
2010-10-27 09:03:21 -07:00
Marc Blank
0e1ffb033a Fix strict mode violation in maybeStartExchangeServiceThread
Bug: 3133688
Change-Id: I94d0b6269c6ebffa54f4a0b29689004feccb01d6
2010-10-27 09:01:50 -07:00
Marc Blank
53e9f81822 Merge "Only callback with sync error if sync was a service request" 2010-10-27 09:00:16 -07:00
Marc Blank
eed42e83ab Cleanup for dump() in AttachmentDownloadService
Change-Id: Id875d3278953ecb3a98ab8b1d290f3883e974c4f
2010-10-27 08:59:13 -07:00
Marc Blank
4a66884b74 Merge "Use notifications for login failures" 2010-10-27 08:57:27 -07:00
Marc Blank
d3e4f3ca7e Use notifications for login failures
* For now, clicking on the notification takes the user to the
  Welcome activity, as we don't have final flows for the new
  account setup UI
* Need comment on strings; the problem is that notification
  text must be rather short if we're to use the standard
  notification display.  It looks like newer UI will allow
  3 lines instead of 2, however.
* Tested w/ IMAP, POP3, EAS, and SMTP

Bug: 2322253
Change-Id: I7ed6fa5599179870cbcdb14af062e956eff37ec5
2010-10-27 08:56:37 -07:00
Dmitri Plotnikov
b07a6fcf33 Merge "Disable picker/shortcuts for Exchange GAL" 2010-10-26 16:47:32 -07:00
Makoto Onuki
ffd258d873 Fix the class name in the log.
Change-Id: Ie672f2e65b28dc742cce561d13aa3016d8bbb1f1
2010-10-26 13:45:52 -07:00
Marc Blank
ad5c2ac04b Only callback with sync error if sync was a service request
* EasSyncService was using the callback for all syncs, including
  those running in the background.  We really only want to report
  back when syncs initiated by Controller fail...

Bug: 2239661
Change-Id: I7c4aceb74fe94ca38f5bdbbabe5dda62ccac60ec
2010-10-26 13:11:12 -07:00
Eric Fischer
7a1aa12c82 am 07820cc8: (-s ours) am 641ef663: Import revised translations. DO NOT MERGE
Merge commit '07820cc8709fa75e39ba891d0db2ea00f88ba928'

* commit '07820cc8709fa75e39ba891d0db2ea00f88ba928':
  Import revised translations.  DO NOT MERGE
2010-10-25 17:31:09 -07:00
Eric Fischer
07820cc870 am 641ef663: Import revised translations. DO NOT MERGE
Merge commit '641ef663f3b141c2ca99fa67db20fcb3608b71e7' into gingerbread-plus-aosp

* commit '641ef663f3b141c2ca99fa67db20fcb3608b71e7':
  Import revised translations.  DO NOT MERGE
2010-10-25 17:11:54 -07:00
Eric Fischer
641ef663f3 Import revised translations. DO NOT MERGE
Change-Id: I822b5937c9b79a312cc066ced05c8874221fdc19
2010-10-25 16:51:00 -07:00
Dmitri Plotnikov
e9cea32218 Disable picker/shortcuts for Exchange GAL
Bug: 3130733

Change-Id: Ib2f324fde3471b76e95ee98aad518fc38c27b9fb
2010-10-25 15:24:56 -07:00
Makoto Onuki
5b072f9129 Merge "Don't use sendMailCallback() -- don't track outbox status" 2010-10-25 13:19:37 -07:00
Makoto Onuki
965e9953b6 Merge "Fix NoSuchMethodError in test" 2010-10-25 13:14:30 -07:00
Makoto Onuki
4c49d7a302 Merge "Fix reply/forward on EAS" 2010-10-25 13:14:18 -07:00
Marc Blank
023285796b Merge "Add dump of AttachmentDownloadService" 2010-10-25 12:49:36 -07:00
Marc Blank
9f40cbcb3e Merge "Don't upsync empty contact tags" 2010-10-25 12:48:31 -07:00
Marc Blank
da0bdb7cec Don't upsync empty contact tags
* EAS 12.0/12.1 don't mind these, but EAS 2.5 objects in some cases
  (title and prefix, certainly)  and the upsync fails
* The error case occurs because the ContentValues provided by
  ContactsProvider actually has a value; the value, however, is an
  empty string
* Prevent this by checking for empty values before serializing

Bug: 2607778
Change-Id: I853ce711024a414f53861720000cc87a7349d660
2010-10-25 12:46:57 -07:00
Makoto Onuki
728c96d6dc Merge "Enable OpenGL acceleration." 2010-10-25 11:47:44 -07:00
Marc Blank
a162668f23 Add dump of AttachmentDownloadService
* Will be helpful for debugging our new background service

Change-Id: Ia865c7c6cb418bd1a1f3d593421b98664c041e07
2010-10-22 16:57:05 -07:00
Makoto Onuki
0e00160074 Fix NoSuchMethodError in test
I should have been used the one without default in the main code,
which uses the other one (with a default), so both can safely be used
in tests.

Bug 3107191

Change-Id: I2011d96f6824a1a6e99e81f5c8e60c966a444d92
2010-10-22 16:16:53 -07:00