Commit Graph

3680 Commits

Author SHA1 Message Date
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 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
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
Eric Fischer b84e9607dd am 9182a1c3: (-s ours) am 731a9705: Import revised translations. DO NOT MERGE 2010-10-22 16:08:29 -07:00
Eric Fischer 9182a1c36b am 731a9705: Import revised translations. DO NOT MERGE 2010-10-22 16:06:37 -07:00
Makoto Onuki be1aa37dc5 Don't use sendMailCallback() -- don't track outbox status
There're differences between how SMTP and EAS use this callback.
We should eventually unify the behavior, but till then let's not
use sendMailCallback().

Bug 3116377

Change-Id: Ic5ecf16251c11ab2bd2e16e29bd417f1ece67f14
2010-10-22 15:45:51 -07:00
Eric Fischer 731a970594 Import revised translations. DO NOT MERGE
Change-Id: I885730c4fd495120c788d11bcd59bbb5fba44743
2010-10-22 15:28:07 -07:00
Makoto Onuki a76c9cdcc7 Fix reply/forward on EAS
When removing the original, need to clear FLAG_TYPE_REPLY and FLAG_TYPE_FORWARD
flags too.

Bug 3125167

Change-Id: I64be98bc10b5e1a0b9242c1c528ed96bb0a24fc1
2010-10-22 14:43:21 -07:00
Jean-Baptiste Queru 9a9c725174 Merge a059c4a1 from gingerbread-plus-aosp
Change-Id: I955120aff44d69bcd6fde165ac7ac974acbd3c78
2010-10-22 05:55:38 -07:00
Marc Blank a059c4a1c7 am 2a08ef0d: Don\'t allow MailService to schedule EAS accounts
Merge commit '2a08ef0d285ebf9e8fe86afec1ac4732586b7bb5' into gingerbread-plus-aosp

* commit '2a08ef0d285ebf9e8fe86afec1ac4732586b7bb5':
  Don't allow MailService to schedule EAS accounts
2010-10-21 23:13:07 -07:00
Marc Blank 7ace73d7f0 am 1ecc7da0: (-s ours) am 4a546f5f: DO NOT MERGE: Backport AttachmentProvider security fix
Merge commit '1ecc7da07ff085d4c23636d4fdd7eaaf0640d026'

* commit '1ecc7da07ff085d4c23636d4fdd7eaaf0640d026':
  DO NOT MERGE: Backport AttachmentProvider security fix
2010-10-21 17:23:45 -07:00
Marc Blank 1ecc7da07f am 4a546f5f: DO NOT MERGE: Backport AttachmentProvider security fix
Merge commit '4a546f5f6e22747304a07ab6892aa318447b5fe7' into gingerbread-plus-aosp

* commit '4a546f5f6e22747304a07ab6892aa318447b5fe7':
  DO NOT MERGE: Backport AttachmentProvider security fix
2010-10-21 17:07:28 -07:00
Marc Blank 2a08ef0d28 Don't allow MailService to schedule EAS accounts
Bug: 3120208
Change-Id: I53e935f8bf08e0bda6e2cd483229a6377ed39d74
2010-10-21 16:49:41 -07:00
Marc Blank 4a546f5f6e DO NOT MERGE: Backport AttachmentProvider security fix
* Apps trying to open attachments using AttachmentProvider were
  seeing SecurityExceptions due to the fact that internal calls
  from AttachmentProvider to EmailProvider didn't have their
  calling identity saved/restored.
* Updated provider calls so that these calls use the Email
  process' identity.
* Backport of Ifb71ad834530c6232728e1aad31439991f8ed379, fixing
  2908737

Bug: 3121146
Change-Id: Ifa3a0ca8d3e34733c937d7f8c60f068984e1f4f2
2010-10-21 15:39:36 -07:00
Makoto Onuki 8c3629c978 Merge "Skip testCommaInserting if screen is off or locked." 2010-10-21 13:54:34 -07:00
Makoto Onuki e9919377ee Skip testCommaInserting if screen is off or locked.
sendKey() doesn't work if the screen is off or locked.

We could probably use a WakeLock and KeyguardLock to force the
screen to be on, but that'd require adding unnecessary permissions
to the email app. (not the test apk)

Bug 1737038

Change-Id: Ic036dc4d12770e82bc5de1133d6dd34cd8465f30
2010-10-21 13:51:46 -07:00
Marc Blank ca065c3927 Merge "Respect the RESPONSE_REQUESTED tag in meeting invite mail" 2010-10-21 08:14:44 -07:00
Makoto Onuki a44c0349fa Merge "Don't move drafts to trash" 2010-10-20 17:37:42 -07:00