Commit Graph

156 Commits

Author SHA1 Message Date
Tom Taylor
0bc4f2ff03 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: I0fd2141436e506a3dc2da04c8ede4701e2a57d19
2016-11-30 14:24:41 -08:00
Vineeta Srivastava
70e0cbfe48 Bell: enable WPAS am: 1156cd7408 am: 78048e375f am: 1ddff725f0
am: 9533787603

Change-Id: I542e7a3ae09d1ee3fea3c542503da2c1556a4f4d
2016-11-23 23:57:19 +00: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
8b3b6ba04c Bell: enable WPAS am: 1156cd7408 am: 78048e375f am: 60636bb71e
am: 2f3e38356f

Change-Id: Ieaf5cc67560a65c8ab6eaf86cb52f597a7eec844
2016-10-25 22:39:08 +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
bb8d1f10eb Merge \\\"Merge remote-tracking branch \\\'goog/nyc-mr1-dev\\\' into aosp/master\\\" into stage-aosp-master am: c3b3f3d8f1 am: 323fb1e22f
am: 4b73fb0532

Change-Id: Ib383ed38cd72c88a477e750ad626142f9ad85b79
2016-06-30 23:14:53 +00: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
d2026f726d Show badge icon if any participant in the conversation is work contact am: 7ad7ac27f1
am: abff43da92

Change-Id: Ia600581af777a880fc1e2f3a8cbcc726818ee600
2016-06-29 20:12:34 +00:00
Tony Mak
afc03962e1 Set the background of linearlayout to be transparent am: dec1aca348
am: 0ff0cdd425

Change-Id: Iff28c93310fb644811d26aad0635d4439cdd1931
2016-06-29 20:12:34 +00:00
Tony Mak
319ece830e Add badge in conversation view if the participant is a work contact am: 2a50ffe57c
am: 3c2cbaa2a0

Change-Id: I4921a10bb5da0857a30511924aa016b151a96aaf
2016-06-29 20:12:33 +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
84feac7e74 Merge \\\"Messenger refuses all file:///data/ uris\\\" into nyc-dev am: 9de3ed279b am: d112c795ac
am: 69e2c494bb

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

Change-Id: I85541bc03d008fabe857f03d9db8e2b56c1c8cfe
2016-06-08 17:14:45 +00: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
Bill Yi
85dc65d6fa Merge "Bump targetSdkVersion to 24 am: f1210c127a am: 4e106215ed" into nyc-mr1-dev-plus-aosp
am: 6b96f314a3

* commit '6b96f314a39f7e7179259848d748ffd6ae05fe6b':

Change-Id: Ic08744dccb5c2dc70ed92c1b9a42674f90f4dea3
2016-06-03 01:17:08 +00:00
Bill Yi
4c80c414c6 Bump targetSdkVersion to 24 am: f1210c127a am: 5159305b99
am: 514b607a10

* commit '514b607a107356e896ac89159c4c17ce15e02f9a':
  Bump targetSdkVersion to 24

Change-Id: I56ca574dcf0d2d4c34d4cd9b03f3c571fbe3ae88
2016-06-03 01:17:08 +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
Tavis Bohne
db1c885d3f Merge "Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev am: ca5fc9fa7d am: 0566cc6b9a" into nyc-mr1-dev-plus-aosp
am: d935ffe467

* commit 'd935ffe46778d26070ded89782853dd1ae59cc52':

Change-Id: I9a92aecb91d7dd4209a3128e418e2695017ab88c
2016-05-16 18:23:50 +00:00
Tavis Bohne
6998dc5025 Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev am: ca5fc9fa7d am: 65e8a2d330
am: 22e3fb6074

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

Change-Id: I61a467aa2debeb9a7feb10e753be8b472bca1195
2016-05-16 18:23:50 +00: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
Tony Mak
6eff90f076 Merge "Add badge icon for work contact in search result am: c4073ff4ce am: 722c058dcc" into nyc-mr1-dev-plus-aosp
am: d67bcb8597

* commit 'd67bcb8597acffc993cf8ee30173f2960b54e7cb':

Change-Id: Iae663ccffa315f422008667efc6d479b13725589
2016-05-16 15:51:53 +00:00
Tony Mak
6ecbdf7893 Merge "Add badge icon for work contact in search result am: c4073ff4ce am: b5fcc65e0d" into nyc-mr1-dev-plus-aosp
am: 2672c4df38

* commit '2672c4df384576ef477e64fc38c40e3e529bae6b':
  Add badge icon for work contact in search result

Change-Id: I4fee26d64ec7e20d730d05c543e3479010d7e440
2016-05-16 15:51:53 +00:00
Tony Mak
0f7d1fce31 Merge "Cleanup enterprise feature in ContactUtil am: e2ccf8bff5 am: 9cd2bdf010" into nyc-mr1-dev-plus-aosp
am: d5c6997677

* commit 'd5c6997677e483a6d04268be5d0fdd9bdbe1d932':

Change-Id: Iac2477bc340bc7b6788b387c3f0a406c9044f818
2016-05-16 15:51:52 +00:00