Commit Graph

140 Commits

Author SHA1 Message Date
Tom Taylor
f1a101e8f4 32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so am: bcc1f62715 am: 5311a02e27 am: 954e81ed44 am: e215495b3b am: a044afd70d am: a1562e5ab6 am: d65f900883 am: 8307b0a020
am: 255c296b3b

Change-Id: I321762fc1c913af3dfa172c60431f8f4ab4a8df2
2016-12-05 23:21:20 +00:00
Tom Taylor
255c296b3b 32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so am: bcc1f62715 am: 5311a02e27 am: 954e81ed44 am: e215495b3b am: a044afd70d am: a1562e5ab6 am: d65f900883
am: 8307b0a020

Change-Id: I49078962418e1970485f7af78ea8d78c25efad59
2016-12-05 23:17:49 +00:00
Tom Taylor
8307b0a020 32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so am: bcc1f62715 am: 5311a02e27 am: 954e81ed44 am: e215495b3b am: a044afd70d am: a1562e5ab6
am: d65f900883

Change-Id: Ia2dc85f87d620c5ca6e28803ab7b62434e2eb74f
2016-12-05 23:13:48 +00:00
Tom Taylor
d65f900883 32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so am: bcc1f62715 am: 5311a02e27 am: 954e81ed44 am: e215495b3b am: a044afd70d
am: a1562e5ab6

Change-Id: Icc21314c2194d15c22fa62dc1d59e6734ffd1108
2016-12-05 23:10:21 +00:00
Tom Taylor
a1562e5ab6 32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so am: bcc1f62715 am: 5311a02e27 am: 954e81ed44 am: e215495b3b
am: a044afd70d

Change-Id: I1adf9711fa5e74f208693bc710e0060b04544b8d
2016-12-05 23:07:21 +00:00
Tom Taylor
a044afd70d 32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so am: bcc1f62715 am: 5311a02e27 am: 954e81ed44
am: e215495b3b

Change-Id: I41014416971669f09f0d43b1a548dc56ba570e4e
2016-12-05 23:03:11 +00:00
Tom Taylor
e215495b3b 32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so am: bcc1f62715 am: 5311a02e27
am: 954e81ed44

Change-Id: I33a015563c7ca0acc011de6e5b30d53d8ae1a7e8
2016-12-05 23:00:12 +00:00
Tom Taylor
954e81ed44 32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so am: bcc1f62715
am: 5311a02e27

Change-Id: I2afadd0fe76f451304f4aa6d7f6a9b0c35dfaf54
2016-12-05 22:57:11 +00:00
Tom Taylor
5311a02e27 32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so
am: bcc1f62715

Change-Id: Ia790b66a2d7d26b53463ebb2ebae524a7b4155fc
2016-12-05 22:53:45 +00:00
Tom Taylor
bcc1f62715 32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so
* No range checking was done on the background color index. Add range
checking and bail if the color index is out of range.

* Test
Manual
- tested sending the gif attached in the bug.
- tested sending a 3.5mb gif to verify the gif transcoding was taking place.
- tested on arm64, arm, and x86 devices.

Change-Id: Id16ddccf05c8472ddebc1284b2a928dafd1be551
Fixes: 32322450
2016-12-01 12:20:44 -08:00
Vineeta Srivastava
9533787603 Bell: enable WPAS am: 1156cd7408 am: 78048e375f
am: 1ddff725f0

Change-Id: Ia96420a941957f7dd68255553c4db5a1904a6422
2016-11-23 23:44:11 +00:00
Vineeta Srivastava
1ddff725f0 Bell: enable WPAS am: 1156cd7408
am: 78048e375f

Change-Id: Ia29596323b2d0e08c34fbef04f0bd6b7043db4df
2016-11-23 23:27:58 +00:00
Vineeta Srivastava
2f3e38356f Bell: enable WPAS am: 1156cd7408 am: 78048e375f
am: 60636bb71e

Change-Id: Iac137abdbd7a5e581f88defeec80ff8340b16df4
2016-10-25 22:35:01 +00:00
Vineeta Srivastava
60636bb71e Bell: enable WPAS am: 1156cd7408
am: 78048e375f

Change-Id: I2df88535bc8f2569417cd3715626cf2d8b88f1ce
2016-10-25 22:31:01 +00:00
Vineeta Srivastava
78048e375f Bell: enable WPAS
am: 1156cd7408

Change-Id: Idc01ae94651a86171aee19a77eed07c85dbaeb69
2016-10-25 22:27:01 +00:00
Vineeta Srivastava
1156cd7408 Bell: enable WPAS
Bell is going to turn on cmas in near future.

Bug: 31316405
Change-Id: Ibf14cf645db5ed0aa3007a91f4c3a28bb1148382
2016-10-24 15:59:07 -07:00
Tony Mak
4b73fb0532 Merge \\"Merge remote-tracking branch \\'goog/nyc-mr1-dev\\' into aosp/master\\" into stage-aosp-master am: c3b3f3d8f1
am: 323fb1e22f

Change-Id: I23d0312277b2204ec7eccb5204024fbd42979dbf
2016-06-30 23:10:05 +00:00
Tony Mak
323fb1e22f Merge \"Merge remote-tracking branch \'goog/nyc-mr1-dev\' into aosp/master\" into stage-aosp-master
am: c3b3f3d8f1

Change-Id: Ia7a15a8fa54b6d995f3a65f04ca4413f930d03d2
2016-06-30 23:06:22 +00:00
Tony Mak
c3b3f3d8f1 Merge "Merge remote-tracking branch 'goog/nyc-mr1-dev' into aosp/master" into stage-aosp-master 2016-06-30 22:56:11 +00:00
Tony Mak
e4e982add9 Merge remote-tracking branch 'goog/nyc-mr1-dev' into aosp/master 2016-06-29 20:11:17 +00:00
Tony Mak
abff43da92 Show badge icon if any participant in the conversation is work contact
am: 7ad7ac27f1

Change-Id: I65217f3af52910a3d93b240e2308d0e176497cc5
2016-06-29 20:05:17 +00:00
Tony Mak
0ff0cdd425 Set the background of linearlayout to be transparent
am: dec1aca348

Change-Id: I3335bf634ec9e4664543d5241eb13adb8ff9e130
2016-06-29 20:05:16 +00:00
Tony Mak
3c2cbaa2a0 Add badge in conversation view if the participant is a work contact
am: 2a50ffe57c

Change-Id: Ib2a1eb8e89ea5de74b7976507b95733abcb8fcdc
2016-06-29 20:05:16 +00:00
Tony Mak
7ad7ac27f1 Show badge icon if any participant in the conversation is work contact
Precompute is_enterprise and stored the value in conversation table.
Include is_enterprise in the ConversationList view.

Change-Id: I2e31bd61c08d25a296aaa3e99cb24631ae2e7976
2016-06-29 10:58:33 +01:00
Tony Mak
dec1aca348 Set the background of linearlayout to be transparent
Change-Id: Iffe33b61ec8d5caca6007c39be02bdaa2f1cb028
2016-06-28 15:48:59 +01:00
Tony Mak
2a50ffe57c Add badge in conversation view if the participant is a work contact
TODO: To handle conversation having more than one participants.

Bug: 29065176
Change-Id: I3820454bf2b76c151dc3a13d9be270502029160d
2016-06-28 15:44:27 +01:00
Tavis Bohne
69e2c494bb Merge \\"Messenger refuses all file:///data/ uris\\" into nyc-dev am: 9de3ed279b
am: d112c795ac

Change-Id: Ia88956bea9f0b93e57a9ad4b21c54097409d41b6
2016-06-08 17:14:27 +00:00
Tavis Bohne
63a0e39806 Merge \\"Messenger refuses all file:///data/ uris\\" into nyc-dev am: 9de3ed279b
am: f0a36952dc

Change-Id: I674e2feb8e4d5378765c6ebec371d76cef7d769a
2016-06-08 17:09:03 +00:00
Tavis Bohne
f0a36952dc Merge \"Messenger refuses all file:///data/ uris\" into nyc-dev
am: 9de3ed279b

Change-Id: I767e29fcbf808a84354b15a511a65f0a4a8a04ae
2016-06-08 17:03:13 +00:00
Tavis Bohne
d112c795ac Merge \"Messenger refuses all file:///data/ uris\" into nyc-dev
am: 9de3ed279b

Change-Id: I2cd79e2d428e421b9159a9e7a665d536ee9b741b
2016-06-08 17:03:13 +00:00
Tavis Bohne
9de3ed279b Merge "Messenger refuses all file:///data/ uris" into nyc-dev 2016-06-08 16:46:45 +00:00
Android Build Merger (Role)
6b96f314a3 Merge "Bump targetSdkVersion to 24 am: f1210c127a am: 4e106215ed" into nyc-mr1-dev-plus-aosp 2016-06-03 01:14:44 +00:00
Bill Yi
514b607a10 Bump targetSdkVersion to 24 am: f1210c127a
am: 5159305b99

* commit '5159305b99d1b1e88687b4b17abb694fa884c8c2':
  Bump targetSdkVersion to 24

Change-Id: I32beacc80deacd958cc191f249638085d6a5b9af
2016-06-03 01:14:33 +00:00
Bill Yi
b3b3b18b4f Bump targetSdkVersion to 24 am: f1210c127a
am: 4e106215ed

* commit '4e106215eda80700eb52c911111ec2e270c4114f':
  Bump targetSdkVersion to 24

Change-Id: Ib27bc29f75d428c39c8094182d42fcaa83f38ca0
2016-06-03 01:14:33 +00:00
Bill Yi
5159305b99 Bump targetSdkVersion to 24
am: f1210c127a

* commit 'f1210c127a4288aa53ec8dd3936a0077c63022eb':
  Bump targetSdkVersion to 24

Change-Id: I6481ab755cacb41adf9924f9d319afda4e28a293
2016-06-03 01:10:05 +00:00
Bill Yi
4e106215ed Bump targetSdkVersion to 24
am: f1210c127a

* commit 'f1210c127a4288aa53ec8dd3936a0077c63022eb':
  Bump targetSdkVersion to 24

Change-Id: I856f624362f64374ca8aa20186c665984d652657
2016-06-03 01:10:04 +00:00
Bill Yi
f1210c127a Bump targetSdkVersion to 24
This will only affect AOSP build.

BUG:28621267
Change-Id: I13f47b838c743674d371901bed2bb7b0e2cfcfc2
2016-06-02 16:23:08 -07:00
Tavis Bohne
41f3b673f1 Messenger refuses all file:///data/ uris
We've been informed it's possible for an app to create a world
readable hardlink in L in its own /data directory that links to
another apps private data, including Messenger data. The hardlink
bypassed our existing checks. So now we simply refuse all file: uris
in the /data/ directory.
Other apps shouldn't be sending file uris anyway, and we dont know
of any that send file:///data/ uris.

Bug: 28793303
Change-Id: I778bb2bcb9e11185357093c59fc1fa3f6caa26a1
2016-05-17 17:36:51 -07:00
Android Build Merger (Role)
d935ffe467 Merge "Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev am: ca5fc9fa7d am: 0566cc6b9a" into nyc-mr1-dev-plus-aosp 2016-05-16 18:21:28 +00:00
Tavis Bohne
22e3fb6074 Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev am: ca5fc9fa7d
am: 65e8a2d330

* commit '65e8a2d33005760f03bb0ca2c412332ab82f7413':
  Messaging doesn't allow sharing of its own files

Change-Id: I5b3a6ffadacd8da1c8db1a626f78ca2bc65a2f7e
2016-05-16 18:21:17 +00:00
Tavis Bohne
505f79c39b Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev am: ca5fc9fa7d
am: 0566cc6b9a

* commit '0566cc6b9a0db6a58034e3837adfbc9ba6ab762b':
  Messaging doesn't allow sharing of its own files

Change-Id: Ia4e2da91fa6479011d1966dd5d604211af416745
2016-05-16 18:21:17 +00:00
Tavis Bohne
65e8a2d330 Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev
am: ca5fc9fa7d

* commit 'ca5fc9fa7dbba6cbab625d4a80f812b7206f0676':
  Messaging doesn't allow sharing of its own files

Change-Id: Ice1aa04a938f9ff14ac3b321344c34bfd152b1dc
2016-05-16 18:18:56 +00:00
Tavis Bohne
0566cc6b9a Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev
am: ca5fc9fa7d

* commit 'ca5fc9fa7dbba6cbab625d4a80f812b7206f0676':
  Messaging doesn't allow sharing of its own files

Change-Id: I812ae5e1b37611a69090e024a858c5813a4a155f
2016-05-16 18:18:56 +00:00
Tavis Bohne
ca5fc9fa7d Merge "Messaging doesn't allow sharing of its own files" into nyc-dev 2016-05-16 18:14:20 +00:00
Android Build Merger (Role)
d67bcb8597 Merge "Add badge icon for work contact in search result am: c4073ff4ce am: 722c058dcc" into nyc-mr1-dev-plus-aosp 2016-05-16 15:48:06 +00:00
Android Build Merger (Role)
2672c4df38 Merge "Add badge icon for work contact in search result am: c4073ff4ce am: b5fcc65e0d" into nyc-mr1-dev-plus-aosp 2016-05-16 15:48:05 +00:00
Android Build Merger (Role)
d5c6997677 Merge "Cleanup enterprise feature in ContactUtil am: e2ccf8bff5 am: 9cd2bdf010" into nyc-mr1-dev-plus-aosp 2016-05-16 15:48:02 +00:00
Android Build Merger (Role)
f921d2f265 Merge "Cleanup enterprise feature in ContactUtil am: e2ccf8bff5 am: 50357f8877" into nyc-mr1-dev-plus-aosp 2016-05-16 15:48:01 +00:00
Android Build Merger (Role)
a4a666c991 Merge "Separate work and personal contacts search result am: 9045160771 am: 47037f9fef" into nyc-mr1-dev-plus-aosp 2016-05-16 15:47:50 +00:00
Android Build Merger (Role)
ce8c016b14 Merge "Separate work and personal contacts search result am: 9045160771 am: 0ecb6b9a9b" into nyc-mr1-dev-plus-aosp 2016-05-16 15:47:46 +00:00