Commit Graph

1476 Commits

Author SHA1 Message Date
Tom Taylor
091876853c Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev
am: 3f6e2e2b07

Change-Id: I7778bcf83bde4fc352f247984e98d77af1e678f1
2016-12-06 22:13:15 +00:00
Tom Taylor
10dccb12ad 32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging
am: 69ed579fb8

Change-Id: I4be088ae899c6729da2197a9ab23951dc95c238e
2016-12-06 22:13:14 +00:00
Tom Taylor
90bf70396d 32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app.
am: a2aa53f83a

Change-Id: I65590775f92c296b490cdc0fa30815a7f69e1e38
2016-12-06 22:13:07 +00:00
Tom Taylor
3f6e2e2b07 Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev 2016-12-06 22:11:03 +00:00
Tom Taylor
a2aa53f83a 32807795 Security Vulnerability - AOSP Messaging App: thirdparty can
attach private files from "/data/data/com.android.messaging/"
directory to the messaging app.

* This is a manual merge from ag/871758 -- backporting a security fix from
Bugle to Kazoo.
* Don't export the MediaScratchFileProvider or the MmsFileProvider. This
will block external access from third party apps. In addition, make both
providers more robust in handling path names. Make sure the file paths
handled in the providers point to the expected directory.

Change-Id: I9e6b3ae0e122e3f5022243418f2893d4a0859edb
Fixes: 32807795
2016-12-05 16:39:55 -08:00
Tom Taylor
33c7742dc0 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: 88b877fa20
am: 8c9f230437

Change-Id: I82eeb2768d976ec379c20ea45227953713ad0094
2016-12-05 23:26:32 +00:00
Tom Taylor
892afb52dc 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
am: f1a101e8f4

Change-Id: I5d3a11fc472be68c342705fd297fd4e2c9f7a84b
2016-12-05 23:26:23 +00:00
Tom Taylor
8c9f230437 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: 88b877fa20

Change-Id: I8ad9f849c9f2680c69154118a7afc370d90d7fd7
2016-12-05 23:21:30 +00:00
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
88b877fa20 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: Ia5a7611f20f4d1dd5274df69c13939a1a7905f55
2016-12-05 23:17:49 +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
69ed579fb8 32161610 Security Vulnerability - Information disclosure vulnerability
in AOSP Messaging

* Check to make sure the returned uri from the gallery picker does
not point to bugle's data directory (or any subdir).

* Test:
Manual-
* I created the test app in the bug, the one that injects the bad
uri into Bugle. I verified the bad behavior before the fix and the
good behavior after.
* I tested the gallery to make sure picking photos,
from the photos app and drive, still work.
* I verified the behavior in the debugger to be sure the code is
catching the bad uri from the test app.

Change-Id: I3393f3b886c837a49758b91945cf1e17ec9bee41
Fixes: 32161610
2016-12-05 13:57:45 -08: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
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