Tom Taylor
30c4aa86d7
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
...
am: c1acc768f6
Change-Id: I6dcdf216d98de94cdd72a15c130b89ef38a9b58f
2016-12-07 03:06:21 +00:00
Tom Taylor
959501b7a8
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
...
am: 6f1cbaf08f
Change-Id: I1026fe6d52c9f91dd31701659237f78e65ee41f5
2016-12-07 03:06:05 +00:00
Tom Taylor
611d8f76df
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f am: 713068d06e
...
am: c2faf5d56b
Change-Id: I156be7aede0a1647d73cac3ef79c02c209085969
2016-12-07 03:06:04 +00:00
Tom Taylor
2e21662e13
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f am: 0c37f58fa0
...
am: d918dfbcd7
Change-Id: Ica18f2cbe878d9c7ba111a2678610eeb47a688ac
2016-12-07 03:05:55 +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
Change-Id: I441e0f4c3f7649796e5d67dc4d14f3a735399be2
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
Change-Id: I8a384b612c72a97c7dfa2bf195df8cd8c6858c32
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
Change-Id: I3b4cd7a04524f500030941b24edcaf2ecabee70d
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
Change-Id: Ieb82c45b1a09c9a8f3cb97ecc7f891971d19f09d
2016-12-07 02:58:04 +00:00
Tom Taylor
713068d06e
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee
...
am: 838049884f
Change-Id: I301dc30acd2a8647fbc8608f09e41500e6d673dd
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
Change-Id: I54b2fc3ed0958a928a75575ba111374aa3c5a69c
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
Change-Id: If6822da7a5eb2d5bb59fd6c31d01c47770e07d7d
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
Change-Id: Iec5af613a115c5120bbfd3e99d6e3503d0a05b36
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
Change-Id: I2be10933c2b692efd21ad911375232029e5e18fa
2016-12-07 02:49:34 +00:00
Tom Taylor
47feeee8ee
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18
...
am: 4d220d4777
Change-Id: I15daa15adbcd98ac51bdc1d1cf2a344c3638207c
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
Change-Id: I773eb76c12d3c3adf1860cc17c1b09ed56b77e2d
2016-12-07 02:46:00 +00:00
Tom Taylor
4d220d4777
resolve merge conflicts of eafd58a to nyc-dev
...
am: a43c5c5f18
Change-Id: Ibcf2308553a68a8deaa05d15548d3eca67d4579a
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
Change-Id: I9ddf0377ce1eff5620104cd0a43bb2eba310e469
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
Tom Taylor
44a2425fa2
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
...
am: 756f34d472
Change-Id: I9adc06844dac348c0dbaf31675387731296a47c1
2016-12-06 22:46:47 +00:00
Tom Taylor
341bf114de
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
...
am: 8588963d8a
Change-Id: I998b3fd25c3e671af84d4fe68aca1e0e51822ecb
2016-12-06 22:46:46 +00:00
Tom Taylor
2ada4e4707
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
...
am: 6d7bb21c8a
Change-Id: Icfb261f102d7403c85bae2073e8c6d9eff437a55
2016-12-06 22:46:39 +00: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
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
Change-Id: I2bc2a0b5cf516caf7d4458e143eeaab75d9b370a
2016-12-06 22:43:08 +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
Change-Id: Iecfaa9939f7ae7651a8fd8b1ba1a256e0945245c
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
Change-Id: Ic6ff3c928a97093885a9d227fac277964cba7f68
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
Change-Id: Ibab72017d2b4f54a77b8ff4030587a05e29b43b8
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
Change-Id: Ife414d257770570e7ea1d24e86b72e4efc3b8a56
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
Change-Id: I0e6378adbd3c2d0b518cfe9f81e6c91abb6b85d4
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
Change-Id: Iaa18124b7f9090efe55a0a46a1851ff5c0b6fe28
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
Change-Id: I16b590f76c9856d1407b336973ba86ff681415c6
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
Change-Id: I1a1351fb195c7d35efc5ca343b966da78e49b71f
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
Change-Id: I5198e8db836d97da6aa05e56958a667af9388076
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
Change-Id: I85b2da9eee3e18db7512ee4b4658f696ea619746
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
Change-Id: Icd96de516d5b9512e6f26c7f66f4be7579eb8212
2016-12-06 22:16:51 +00:00
Tom Taylor
a21b8f936e
32161610 Security Vulnerability - Information disclosure vulnerability in AOSP Messaging am: 69ed579fb8
...
am: 10dccb12ad
Change-Id: Ia9830002762794a35da40daf8cc19f62434fabba
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
Change-Id: I83792b4135c1e7adaf30f5835742fd1898b1b451
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
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