Commit Graph

14288 Commits

Author SHA1 Message Date
Jessica Wagantall de1a096980 Android 6.0.1 Release 72 (M4B30X)
-----BEGIN PGP SIGNATURE-----
 
 iEYEABECAAYFAlfz3TAACgkQ6K0/gZqxDngnnACfWpBBPD+MBlDoVY2FWqXt7Sqb
 hJwAnjOXT7GJvfSU5u5YclHC75odF/kw
 =1TOl
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r72' into HEAD

Android 6.0.1 Release 72 (M4B30X)

# gpg: Signature made Tue 04 Oct 2016 09:47:44 AM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found
2016-10-06 11:50:32 -07:00
pinky@build01 6e0da11acf Automatic translation import
Change-Id: I754a9192727663b9fb3bf2703ddb65ed4e2aae23
Ticket: -
2016-09-25 00:15:32 -07:00
Jessica Wagantall b7d0aee7f0 Android 6.0.1 release 66
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlfO7lgACgkQ6K0/gZqxDngc2ACfZbbFQwPNwcKdvsSkc86RQp3V
 0D4An0Djf1+JGySqLfiJex4600uwb/49
 =kr4V
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r66' into HEAD

Android 6.0.1 release 66

# gpg: Signature made Tue 06 Sep 2016 09:27:04 AM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found
2016-09-07 12:40:29 -07:00
pinky@build01 644cde9c3b Automatic translation import
Change-Id: I8a06d0c90beb9f3a10e5ab2d0c6b0439a0af4250
Ticket: -
2016-08-29 14:01:39 -07:00
pinky@build01 5c4de0dd33 Automatic translation import
Change-Id: I73cc3b198e7afefac7ca45b9182c27fbb5c9cf84
Ticket: -
2016-08-27 14:22:16 -07:00
Rohan Shah a549245b2f Limit account id and id to longs
The security issue occurs because id is allowed to be an arbitrary
path instead of being limited to what it is -- a long. Both id
and account id are now parsed into longs (and if either fails, an
error will be logged and null will be returned).

Tested/verified error is logged using the reported attack.

BUG=30745403

Change-Id: Ia21418545bbaeb96fb5ab6c3f4e71858e57b8684
(cherry picked from commit 9794d7e8216138adf143a3b6faf3d5683316a662)
2016-08-26 16:22:04 -07:00
Andy Huang e81af0322a stop exporting EmailAccountCacheProvider
Bug: 29767043
Change-Id: Ib9f16385a5e63557b6f293d148e49c9ad044c9b4
2016-08-16 15:52:37 -07:00
Andy Huang cb2dfe43f2 stop exporting EmailAccountCacheProvider
Bug: 29767043
Change-Id: Ib9f16385a5e63557b6f293d148e49c9ad044c9b4
2016-07-21 17:35:18 -07:00
Abhisek Devkota 2ad31cb4d0 Automatic translation import
Change-Id: Iaec2fcecbb6c499dc8617717e5ee403acf4e5ec7
2016-05-15 02:47:31 +02:00
Abhisek Devkota cb45162c04 Automatic translation import
Change-Id: Ic4be3ce549087ff3eb1658bad42be2a42f33258b
2016-05-14 11:17:59 +02:00
Jessica Wagantall 81609f7861 Android 6.0.1 release 43 (MOB30J)
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlcn+/8ACgkQ6K0/gZqxDngeagCePtxlUAf+tst/1shNLpqiZaiv
 LYwAnA3zmeOA1zGXv54UbxcjldWWqeN6
 =lIlM
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r43' into HEAD

Ticket: CYNGNOS-2373
Android 6.0.1 release 43 (MOB30J)

Change-Id: I1241266b370fb1ba0560217684002d01867a0c77
2016-05-03 12:00:00 -07:00
Michael Bestas 89e216df34 Revert "Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/Email into cm-13.0"
This reverts commit 97bb12ecc4, reversing
changes made to 457778a056.

Change-Id: If9444c1b4824e94f2cfe7074e87e98a5d46f0c6b
2016-05-01 23:28:43 +03:00
Michael Bestas 38662a1598 Automatic translation import
Change-Id: Ic350055294d1302930880df63edeabb45869613c
2016-04-16 17:46:52 +03:00
Michael Bestas f1e5876de0 Automatic translation import
Change-Id: I4978f0ed82da34c24d65bf6ade6aa331875983c0
2016-04-06 01:17:25 +03:00
Michael Bestas bab9090ffa Automatic translation import
Change-Id: I63554dfc536493d83b6fcf62e7e710e11d1124f0
2016-03-28 00:45:27 +03:00
Sam Lee 2791f0b33b Don't allow cachedFile Attachments if the content Uri is pointing to EmailProvider.
This is to backport a security fix reported by b/27308057 and b/27335139.
Also, add Analytics for these errors.

Bug: b/27335139
Change-Id: Iaacb34e4983cdf9a85487222ae930cb64d80a193
2016-03-25 17:48:04 -07:00
Michael Bestas 515995534b Automatic translation import
Change-Id: Icfb9b53a760d25e78f150e7a2f089aeac20a2a76
2016-03-17 21:58:35 +02:00
Steve Kondik 97bb12ecc4 Android 6.0.1 release 22
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlbd4ToACgkQ6K0/gZqxDng9EACgi+ju6KA5Fiexz7+LYHPmXvsx
 BmMAmwfY8Q3sLnQNjOZI4BmTUHjEG8B3
 =3bnz
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/Email into cm-13.0

Android 6.0.1 release 22
2016-03-10 18:22:59 -08:00
Michael Bestas 457778a056 Automatic translation import
Change-Id: I8f12eab6eb3d524a8967ad1bb0a4d048bd100bc8
2016-03-05 00:17:33 +02:00
Michael Bestas 7ffe95ddff Automatic translation import
Change-Id: I97bc9a320aeabe172a9dd4abf443956063d27774
2016-02-22 05:13:22 +02:00
Michael Bestas 493ce6ce41 Automatic translation import
Change-Id: I85798f7a96bb1195447796417a1f4cf8929532fe
2016-02-14 16:24:34 +02:00
Michael Bestas 08bde27f04 Automatic translation import
Change-Id: I67516c359ef0b485050c64e37d3523898187fd7c
2016-02-02 06:59:41 +02:00
Danny Baumann a29e6b2215 Improve notification coalescence algorithm.
Instead of coalescing for 15 seconds after the first change
notification, coalesce until change notifications have been idle for at
least 2 seconds. This avoids long update delays, which is especially
jarring when using notifications on a wearable and the initial
notification didn't yet include the message body.
Also skip coalescence entirely for deletions; update immediately in that
case.

Change-Id: I67bed9a1af7b023020b0fd5429495eb45000e858
2016-01-20 23:32:40 -08:00
Jorge Ruesga 34fb128e43 email: junk icon
Change-Id: I5c5ad8e76025c92c2b11dd1948e32eaa5efe8fd5
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
(cherry picked from commit b9984debe6b72f06cbf9bf72baa54b80f017eb38)
2016-01-13 05:03:18 -08:00
Jorge Ruesga c929853c2d email: return default folder name for subfolders
For subfolders of system folder type return the remote folder name instead of translate
it to the default folder type resource name. Subfolders shouldn't be considered as
system folders. For example a SPAM folder of a SPAM root folder (Junk/Ham should
be displayed as  Ham instead of Junk).

Change-Id: I2644b8da336e3f0983d24355aefe961aa8acf30b
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
(cherry picked from commit db1ca54cd325c64971240d92ed11dad175d83579)
2016-01-13 03:18:14 -08:00
Michael Bestas fab6ba77a4 Automatic translation import
Change-Id: I86e068c4114bfa5b831eb7be587027205225602c
2016-01-11 22:42:27 +02:00
Michael Bestas 325beae1c4 Automatic translation import
Change-Id: I401c2158e4585f8144d5d4b1854a862d9e6728d5
2015-12-25 19:35:51 +02:00
Steve Kondik ebf1d238a4 Android 6.0.1 release 3
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZmBAsACgkQ6K0/gZqxDng8NACfR1//Ny971xyToaYF1WHezpuA
 tFgAn3QeI0nMmJIDEa8IS69XQ+RHko1x
 =a1qU
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/packages/apps/Email into HEAD

Android 6.0.1 release 3
2015-12-07 16:58:14 -08:00
AdrianDC 44d848684d Email: Clean duplicated WRITE_CONTACTS permission
Change-Id: I2f20c9d39de8132da16dd985350189a54e659244
Signed-off-by: AdrianDC <radian.dc@gmail.com>
2015-11-19 21:49:15 +01:00
Steve Kondik cf825a5f7f Merge branch 'LA.BF64.1.2.2_rb4.7' of git://codeaurora.org/platform/packages/apps/Email into cm-13.0 2015-11-16 14:42:46 -08:00
wangjing 0bda8528e3 Email: Fix the ActivityNotFoundException when click "Update now"
There is no activity response the intent of action VIEW and
data auth://com.android.email.ACCOUNT_SECURITY.

Add the intent filter for activity AccountSecurity, then this activity
can handle this intent.

CRs-fixed: 816922
Change-Id: I0b8982c63bd31d3fcca506fde9a1ad0d72e38cbb
2015-11-04 21:20:06 -08:00
Jorge Ruesga e3c39f0e6d email: Add an ActionBar to the mail app's PreferenceActivity
Change-Id: Id2ed98d2c2cd6648e179fb2942f3bc4479049cd0
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
2015-10-18 14:06:01 -07:00
Michael Bestas 296d358d37 Automatic translation import
Change-Id: Icd59665373860db2bce17afae4c4ff66ec706359
2015-10-18 14:06:01 -07:00
Jorge Ruesga 6adbdc9f6b email: fix empty body update
Currently, body text and html are removed from the content values to be stored as files
in the filesystem. This could lead to a IllegalArgumentException because we passed
an empty content value to the update operation. We must ensure that we update
at least one item.

Related BUGDUMP-4037330 and http://forum.cyanogenmod.org/topic/112563-massive-data-use

Change-Id: Ib9ba10eb2cb86598bef6e5f8bc11553d09fc4ef8
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
2015-10-18 14:06:01 -07:00
Michael Bestas ead5cd372c Automatic translation import
Change-Id: I432e8ba78567048f45c939b15032ca96902353b2
2015-10-18 14:06:01 -07:00
Michael Bestas 5798905bd2 Automatic translation import
Change-Id: I10b18c7f8674660d0ec1081c316361da49c434a8
2015-10-18 14:06:01 -07:00
Tom Powell 47301c4d54 Automatic translation import
Change-Id: I3788414aaa622ea6a9fb1bdd496314ba2ccfb4e7
2015-10-18 14:06:01 -07:00
Tom Powell f5e0be5091 Automatic translation import
Change-Id: I62f9837f18625f827ff3ed1df3eb1574c7d64da1
2015-10-18 14:06:01 -07:00
Tom Powell 3ac9b69c53 Automatic translation import
Change-Id: I099dc2db2e4f1db8b3e8cc95d606108e9206ea77
2015-10-18 14:06:01 -07:00
Michael Bestas dc3b9f8340 Automatic translation import
Change-Id: I27808a9f2c08b848bcf44b07cbf3c8e0aeee7500
2015-10-18 14:06:01 -07:00
Michael Bestas 9bec316ecd Automatic translation import
Change-Id: I08bd531f3bfaab3feb3ee72ea0eaadeb657eb5a1
2015-10-18 14:06:01 -07:00
Michael Bestas d6eb8adcdc Automatic translation import
Change-Id: I851a2a39059f7db6b773515475e9001a0b90806c
2015-10-18 14:06:01 -07:00
Michael Bestas 94dcf047d0 Automatic translation import
Change-Id: I976db98cec4a120d7d9bb9810c0e0dd597bf9f8c
2015-10-18 14:06:01 -07:00
Danny Baumann a9aaccb8f6 Allow saving attachments even if there's no intent handling them.
For e.g. compressed files that doesn't mean they can't be opened, as
they still can be unpacked by the file manager.

Change-Id: I53c80b7bedb44732bc1cf346a83c1f6e39fb0da0
2015-10-18 14:06:01 -07:00
Danny Baumann 39e1c44e7c Allow download of compressed attachments.
Assuming all compressed files are malware is a little extreme.

Change-Id: I0ef776f3ad4af1fb73199989c99ab05171353d17
2015-10-18 14:06:01 -07:00
Michael Bestas fe527522cf Automatic translation import
Change-Id: If61323bf1d0cdbdff1ad6f090b24debc96a2213a
2015-10-18 14:06:01 -07:00
Danny Baumann a73579b5b3 Don't cancel PendingIntents used for AlarmManager.
Creating new ones (which is the implicit effect of FLAG_CANCEL_CURRENT)
causes PendingIntent.equals() to return false for the new and the old
instance, which in turn leads to AlarmManager failing to remove the
alarm.

Also remove the unneeded request code offsets. The intent actions for
the various actions are already distinct, so we need to only identify
between the intents that have the same actions; using the mailbox ID as
request code is sufficient for that purpose.

Change-Id: I9030c24a9c6b1c722b246601fde741f7027d3de7
2015-10-18 14:06:01 -07:00
Danny Baumann 99c6d7b40a Optimize connection loss and re-gain behaviour.
Schedule the ping restart through AlarmManager to be able to cancel it
properly on connection loss, and make sure to only restart idle
connections that aren't already idling (which may happen e.g. on bootup
or if there was a sync request in the 30 second wait window).

Change-Id: If62ffa0981a7a0a71ed7764a9724c07466c6d8a3
2015-10-18 14:06:01 -07:00
Danny Baumann a0ef884d04 Refine thread handling.
Remove mailboxes from the list synchronously and just do the network I/O
and thread joins in the background.

Change-Id: I2a339e5982c103b69f1212627f1cc98e98a8a068
2015-10-18 14:06:01 -07:00
Danny Baumann c96099279b Properly unregister alarm manager callbacks.
Change-Id: I2d474bc1cee168a5b76b8710b382498cd6c2fd59
2015-10-18 14:06:01 -07:00