Android Build Merger (Role)
aba491e150
Merge "Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e am: 208a2979d4" into nyc-mr2-dev-plus-aosp
2016-12-07 03:02:09 +00:00
Android Build Merger (Role)
ab3d4505b8
Merge "Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e am: 904b5cbec5" into nyc-mr2-dev-plus-aosp
2016-12-07 03:02:08 +00:00
Tom Taylor
6866222775
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e
...
am: 208a2979d4
2016-12-07 03:02:03 +00:00
Tom Taylor
c1acc768f6
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5 am: 4d1366300e
...
am: 904b5cbec5
2016-12-07 03:02:03 +00:00
Android Build Merger (Role)
6f1cbaf08f
Merge "resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f am: 713068d06e" into nyc-mr2-dev-plus-aosp
2016-12-07 03:02:00 +00:00
Tom Taylor
c2faf5d56b
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f
...
am: 713068d06e
2016-12-07 03:01:55 +00:00
Tom Taylor
d918dfbcd7
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f
...
am: 0c37f58fa0
2016-12-07 03:01:55 +00:00
Tom Taylor
904b5cbec5
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5
...
am: 4d1366300e
2016-12-07 02:58:04 +00:00
Tom Taylor
208a2979d4
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03 am: 28c5e61eb5
...
am: 4d1366300e
2016-12-07 02:58:02 +00:00
Tom Taylor
713068d06e
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee
...
am: 838049884f
2016-12-07 02:57:54 +00:00
Tom Taylor
0c37f58fa0
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee
...
am: 838049884f
2016-12-07 02:57:54 +00:00
Tom Taylor
4d1366300e
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb am: 8166028e03
...
am: 28c5e61eb5
2016-12-07 02:54:04 +00:00
Tom Taylor
838049884f
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777
...
am: 47feeee8ee
2016-12-07 02:53:54 +00:00
Tom Taylor
28c5e61eb5
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c am: 518c9798eb
...
am: 8166028e03
2016-12-07 02:49:34 +00:00
Tom Taylor
47feeee8ee
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18
...
am: 4d220d4777
2016-12-07 02:49:24 +00:00
Tom Taylor
8166028e03
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6 am: ced2069d1c
...
am: 518c9798eb
2016-12-07 02:46:00 +00:00
Tom Taylor
4d220d4777
resolve merge conflicts of eafd58a to nyc-dev
...
am: a43c5c5f18
2016-12-07 02:45:53 +00:00
Tom Taylor
518c9798eb
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c am: 5cfdea9be6
...
am: ced2069d1c
2016-12-07 02:41:54 +00:00
Tom Taylor
a43c5c5f18
resolve merge conflicts of eafd58a to nyc-dev
...
Change-Id: I58151ca0c248dd4b84c78c8e7ca73d5a80bbd962
2016-12-06 16:26:14 -08:00
Android Build Merger (Role)
756f34d472
Merge "32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da am: 615f6d0b17 am: 49b092f602 am: 55ebb66b11" into nyc-mr2-dev-plus-aosp
2016-12-06 22:43:14 +00:00
Tom Taylor
6d7bb21c8a
32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da am: 615f6d0b17 am: 49b092f602
...
am: a9bec8503b
2016-12-06 22:43:08 +00:00
Tom Taylor
8588963d8a
32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da am: 615f6d0b17 am: 49b092f602
...
am: 55ebb66b11
2016-12-06 22:43:08 +00:00
Tom Taylor
55ebb66b11
32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da am: 615f6d0b17
...
am: 49b092f602
2016-12-06 22:39:38 +00:00
Tom Taylor
a9bec8503b
32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da am: 615f6d0b17
...
am: 49b092f602
2016-12-06 22:39:38 +00:00
Tom Taylor
49b092f602
32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7 am: 4dfcff98da
...
am: 615f6d0b17
2016-12-06 22:36:08 +00:00
Tom Taylor
615f6d0b17
32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef am: 313284eee7
...
am: 4dfcff98da
2016-12-06 22:31:37 +00:00
Tom Taylor
4dfcff98da
32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19 am: 2397f2fbef
...
am: 313284eee7
2016-12-06 22:27:37 +00:00
Tom Taylor
313284eee7
32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d am: 305a004e19
...
am: 2397f2fbef
2016-12-06 22:24:07 +00:00
Tom Taylor
ced2069d1c
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07 am: 091876853c
...
am: 5cfdea9be6
2016-12-06 22:20:25 +00:00
Tom Taylor
eafd58a112
32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging am: 69ed579fb8 am: 10dccb12ad
...
am: a21b8f936e
2016-12-06 22:20:14 +00:00
Tom Taylor
2397f2fbef
32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a am: 90bf70396d
...
am: 305a004e19
2016-12-06 22:20:07 +00:00
Tom Taylor
5cfdea9be6
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev am: 3f6e2e2b07
...
am: 091876853c
2016-12-06 22:16:51 +00:00
Tom Taylor
a21b8f936e
32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging am: 69ed579fb8
...
am: 10dccb12ad
2016-12-06 22:16:44 +00:00
Tom Taylor
305a004e19
32807795 Security Vulnerability - AOSP Messaging App: thirdparty can attach private files from "/data/data/com.android.messaging/" directory to the messaging app. am: a2aa53f83a
...
am: 90bf70396d
2016-12-06 22:16:36 +00:00
Tom Taylor
091876853c
Merge "32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging" into mnc-dev
...
am: 3f6e2e2b07
2016-12-06 22:13:15 +00:00
Tom Taylor
10dccb12ad
32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging
...
am: 69ed579fb8
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
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
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
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
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
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
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
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
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
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
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
2016-12-05 23:00:12 +00:00
Tom Taylor
954e81ed44
32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so am: bcc1f62715
...
am: 5311a02e27
2016-12-05 22:57:11 +00:00
Tom Taylor
5311a02e27
32322450 Security Vulnerability - heap buffer overflow in libgiftranscode.so
...
am: bcc1f62715
2016-12-05 22:53:45 +00:00
