Narayan Kamath
|
48d16243f9
|
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485 am: a045aed7a2 am: 846f64c6fc am: 83b46a1590 am: 330d0ebf48 am: 21c1e58090 am: 81fd9e618c am: 2c13554c18 am: fb207962aa am: 44e645e59a
am: f2a94f71fb
Change-Id: Ie17b51e1d33668cf8a8566a65ec9182c17cace16
|
2016-11-14 14:00:45 +00:00 |
|
neo.chae
|
b1d07e379c
|
Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e am: fb74b8773a am: c58ec27e1c am: 7489336fed am: 0212d4f3fa am: aaf785c827 am: 4b72904585 am: 7530ea7ec0
am: fa2e233c30
Change-Id: I8ab4857b2a24d5ef7141254a7f2aaa789d56c819
|
2016-11-14 14:00:33 +00:00 |
|
Andriy Naborskyy
|
415ec85fdb
|
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am: 11da2b5de3 -s ours am: 3f39609cff -s ours am: fb4beac069 -s ours am: 18305d920e -s ours
am: 0a2ac837d1 -s ours
Change-Id: I0ba7195818a50a4f5260022370aa3a26e5dbd40d
|
2016-11-14 14:00:26 +00:00 |
|
Narayan Kamath
|
02fefe4dbb
|
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am: b3b03a9d78 am: ba23956c45 am: a20eebfab7 am: 8e6e5a157b am: 65abe1066d am: a13068a1c8 am: 3e85db46bc am: 5ad1a52678 am: 8ff9e7104c
am: 10c879e8d7
Change-Id: I7ed9180bab2c10fa24865773dfc99cceb75c3592
|
2016-11-14 14:00:13 +00:00 |
|
Narayan Kamath
|
deabe2c324
|
Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f am: f8335b6a59 am: 2f8ce5f5cb am: 5515b415aa am: d212aa9d13 am: 3b89a68a08 am: 146a0f86a6 am: 327edfeba2
am: 51930580bf
Change-Id: I7dfa706aab6051e0b25c976f187091c2d8927c45
|
2016-11-14 13:59:40 +00:00 |
|
Xin Li
|
8ce3691f79
|
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb am: 34de2a2d45 -s ours am: a5c82e7dd9 am: ca2abc5b71 am: ae5db8a6dc am: db984f917c -s ours am: ee6b51a05b am: 20def2e75f am: 6e8fef24d9 am: eb4de1706e
am: 9d04aa4f81
Change-Id: I5b81dc5fdec7019befcac49271f71bd8c55327a6
|
2016-11-14 13:59:17 +00:00 |
|
Narayan Kamath
|
43dcd96aa9
|
Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e am: d501e032d8 am: 932cd0ed0e am: d17867203b am: 59e6dccb4c am: 53af5fe3f7 am: 56294db4d4 am: 8fecc8687b am: 9f37c28a17
am: ce1513d22c
Change-Id: I3b875a0557af4cacf653140daa70d7e15df122b6
|
2016-11-14 13:58:55 +00:00 |
|
Narayan Kamath
|
9facd98e75
|
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am: d60156dfc6 am: fd23b9d509 am: b0a7831375 am: 5594cfc2c3 am: 6ca924b884 am: ae457e03b7 am: 0c8da8aa05 am: 1f9abe310f am: f45a1a0fe6 am: 58d1705c64
am: 1886232f48
Change-Id: I52ea7397d96eebbec543a584c2372e44a7a00ca4
|
2016-11-14 13:58:30 +00:00 |
|
Hugo Benichi
|
df8096caff
|
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167 am: 3d9a2d7206 am: e40917b1ae am: afa3694ea9 am: 37cacc77ce am: 4bdf37c204 am: fd3e6e8d25 am: bfa2fed779 am: fb2b64d037
am: 4f54673515
Change-Id: I33c0989152099935e4d2da167757afe470e87d70
|
2016-11-14 13:57:45 +00:00 |
|
Xin Li
|
2129e3b757
|
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fcec -s ours am: 16090c6177 -s ours am: 0a568ae56e am: 9788dd5bd2 am: 6ec8dd10bb am: 921dd6a5fd -s ours am: 05a61276c6 am: 23270f1311 am: 5386c74a44 am: f3e0e13b54
am: 3a86cff442
Change-Id: I4b2964c8393965be2597f48728ee0985cecc627f
|
2016-11-14 13:57:43 +00:00 |
|
Andriy Naborskyy
|
bb1dfdc660
|
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am: c5bf8bc74d -s ours am: f380f53752 -s ours am: dbbde14239 -s ours am: f566a1d4bf -s ours
am: e26d15582b -s ours
Change-Id: I6e1c029f57f69785b9a7070ec6e8c35673b65cc2
|
2016-11-14 13:56:46 +00:00 |
|
Narayan Kamath
|
3fca84af72
|
Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2 am: 77decadefe am: 11b3161c41 am: 5cbd448348 am: a9fae33c11 am: 05f59b1f1d
am: ec69d20c3d
Change-Id: I3885439df19100036fcd1bef31e1f86fe86a07bd
|
2016-11-14 13:56:28 +00:00 |
|
Hugo Benichi
|
b2cabe028e
|
DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev am: 476da32d86 -s ours am: bdf4d8a93c am: 1d61b01a5d am: 9a6f65608a am: 6db87b6e2a
am: a2df7e367f -s ours
Change-Id: Id2de4a819d8b571a9ff8a54c3b5204be03e675fe
|
2016-11-14 13:56:24 +00:00 |
|
Brian Carlstrom
|
46abcdd83f
|
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am: 5d0cabf78e am: 3be5dec18a am: b272d7cb13 am: f9150bf362 am: 58612638d1
am: d9ea80d009
Change-Id: I086d525fa3cdfd34d1b1ad5089662ea7eb57a418
|
2016-11-14 13:55:41 +00:00 |
|
Narayan Kamath
|
19ee3109e1
|
Zygote : Block SIGCHLD during fork. am: b6f3751599 am: b23e864573 am: 52021073a4 am: 479385b6b3 am: 5f70cb0898
am: df3e599c7d
Change-Id: Ida0d973df74c0636e6b93df4af296cd74c3103cb
|
2016-11-14 13:54:35 +00:00 |
|
Narayan Kamath
|
86e1929551
|
Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 am: 50b0c3be57 -s ours am: e1e735bcb9 am: 072b70bae3 am: ba6d5ee377 am: f3f784853d am: 8ea47824fa
am: 2f2611636b
Change-Id: Ie36e3041b72422b78a7335198671fc893c763614
|
2016-11-14 13:53:28 +00:00 |
|
Narayan Kamath
|
6b7badc832
|
Zygote: Additional whitelists for runtime overlay / other static resources. am: 0ad0e859f6 am: 1e6a5d11a6 am: f0cd32619e -s ours am: 4c26a969e9 am: b7884e5a9f am: da65c74c54 am: 24b2a54a84 am: 4a204149eb am: e58ee798c1 am: 83be5fdebb
am: 4c5dc7e622
Change-Id: I0b9b598150782a50f8a2e6c3f93acf9fed969c4e
|
2016-11-14 13:52:23 +00:00 |
|
Narayan Kamath
|
f2a94f71fb
|
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485 am: a045aed7a2 am: 846f64c6fc am: 83b46a1590 am: 330d0ebf48 am: 21c1e58090 am: 81fd9e618c am: 2c13554c18 am: fb207962aa
am: 44e645e59a
Change-Id: I950358108a9df60418e9d1370f55fdc81a2046f5
|
2016-11-14 13:52:18 +00:00 |
|
neo.chae
|
fa2e233c30
|
Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e am: fb74b8773a am: c58ec27e1c am: 7489336fed am: 0212d4f3fa am: aaf785c827 am: 4b72904585
am: 7530ea7ec0
Change-Id: I887d0fa23e82fad83759b47aa9b3cb7c0ab5dea0
|
2016-11-14 13:51:14 +00:00 |
|
Narayan Kamath
|
51930580bf
|
Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f am: f8335b6a59 am: 2f8ce5f5cb am: 5515b415aa am: d212aa9d13 am: 3b89a68a08 am: 146a0f86a6
am: 327edfeba2
Change-Id: Ibe4a93c42a9594dce74b76a9ae6e2e32cb11b1e5
|
2016-11-14 13:51:05 +00:00 |
|
Narayan Kamath
|
1886232f48
|
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am: d60156dfc6 am: fd23b9d509 am: b0a7831375 am: 5594cfc2c3 am: 6ca924b884 am: ae457e03b7 am: 0c8da8aa05 am: 1f9abe310f am: f45a1a0fe6
am: 58d1705c64
Change-Id: Ia768dae225459af1d7bcea6a7aa78bc2df170199
|
2016-11-14 13:50:00 +00:00 |
|
Xin Li
|
9d04aa4f81
|
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb am: 34de2a2d45 -s ours am: a5c82e7dd9 am: ca2abc5b71 am: ae5db8a6dc am: db984f917c -s ours am: ee6b51a05b am: 20def2e75f am: 6e8fef24d9
am: eb4de1706e
Change-Id: I1a405d53ae83b3e227f258d8aded7c9e1c0d6e88
|
2016-11-14 13:49:59 +00:00 |
|
Narayan Kamath
|
1907f3b17e
|
Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247 am: d98e75feca am: 87dc13f249 am: c50c43667f am: a5ff6c84a2 am: 9efaadccc0
am: 6861821082
Change-Id: I3abe13ffda27d4920a989c7f91ac2643f15209a3
|
2016-11-14 13:49:10 +00:00 |
|
Narayan Kamath
|
10c879e8d7
|
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am: b3b03a9d78 am: ba23956c45 am: a20eebfab7 am: 8e6e5a157b am: 65abe1066d am: a13068a1c8 am: 3e85db46bc am: 5ad1a52678
am: 8ff9e7104c
Change-Id: I818d6006fd3af80313e1d903f94f2a6e1fcb52ef
|
2016-11-14 13:47:59 +00:00 |
|
Narayan Kamath
|
ce1513d22c
|
Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e am: d501e032d8 am: 932cd0ed0e am: d17867203b am: 59e6dccb4c am: 53af5fe3f7 am: 56294db4d4 am: 8fecc8687b
am: 9f37c28a17
Change-Id: I472cd78ae1b956126feea81dd619310c44d4801a
|
2016-11-14 13:46:47 +00:00 |
|
Xin Li
|
3a86cff442
|
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fcec -s ours am: 16090c6177 -s ours am: 0a568ae56e am: 9788dd5bd2 am: 6ec8dd10bb am: 921dd6a5fd -s ours am: 05a61276c6 am: 23270f1311 am: 5386c74a44
am: f3e0e13b54
Change-Id: I3bd3b1405acac465f3974f3cd9ff231a1800aa16
|
2016-11-14 13:45:53 +00:00 |
|
Hugo Benichi
|
4f54673515
|
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167 am: 3d9a2d7206 am: e40917b1ae am: afa3694ea9 am: 37cacc77ce am: 4bdf37c204 am: fd3e6e8d25 am: bfa2fed779
am: fb2b64d037
Change-Id: Ic4c6875e06bd4eddd32cff43054c84bd5fa326fd
|
2016-11-14 13:45:24 +00:00 |
|
Narayan Kamath
|
ec69d20c3d
|
Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2 am: 77decadefe am: 11b3161c41 am: 5cbd448348 am: a9fae33c11
am: 05f59b1f1d
Change-Id: I5382ba916ec72d4ecb519dac5a89bce35947738f
|
2016-11-14 13:44:35 +00:00 |
|
Hugo Benichi
|
a2df7e367f
|
DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev am: 476da32d86 -s ours am: bdf4d8a93c am: 1d61b01a5d am: 9a6f65608a
am: 6db87b6e2a
Change-Id: I81963b856cc76598555fb51fb27874d22c543fcb
|
2016-11-14 13:44:05 +00:00 |
|
Andriy Naborskyy
|
0a2ac837d1
|
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am: 11da2b5de3 -s ours am: 3f39609cff -s ours am: fb4beac069 -s ours
am: 18305d920e -s ours
Change-Id: I7cc54b33bc5a37f5ff7f23ba3a33cb477932eb8e
|
2016-11-14 13:42:21 +00:00 |
|
Narayan Kamath
|
4c5dc7e622
|
Zygote: Additional whitelists for runtime overlay / other static resources. am: 0ad0e859f6 am: 1e6a5d11a6 am: f0cd32619e -s ours am: 4c26a969e9 am: b7884e5a9f am: da65c74c54 am: 24b2a54a84 am: 4a204149eb am: e58ee798c1
am: 83be5fdebb
Change-Id: I31fd20827d22d0b8cb3b8df8db99e1b0aad6fa85
|
2016-11-14 13:41:49 +00:00 |
|
Andriy Naborskyy
|
e26d15582b
|
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am: c5bf8bc74d -s ours am: f380f53752 -s ours am: dbbde14239 -s ours
am: f566a1d4bf -s ours
Change-Id: I6323c0bc2a591cd3b50dd44b0ea519730f703b15
|
2016-11-14 13:41:20 +00:00 |
|
neo.chae
|
7530ea7ec0
|
Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e am: fb74b8773a am: c58ec27e1c am: 7489336fed am: 0212d4f3fa am: aaf785c827
am: 4b72904585
Change-Id: I365cdb2764ffb15f233cfeb43339e6acbc369e49
|
2016-11-14 13:40:37 +00:00 |
|
Brian Carlstrom
|
d9ea80d009
|
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am: 5d0cabf78e am: 3be5dec18a am: b272d7cb13 am: f9150bf362
am: 58612638d1
Change-Id: If03a724c633b1ba97bfd7797f61d0f706654f923
|
2016-11-14 13:40:16 +00:00 |
|
Xin Li
|
eb4de1706e
|
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb am: 34de2a2d45 -s ours am: a5c82e7dd9 am: ca2abc5b71 am: ae5db8a6dc am: db984f917c -s ours am: ee6b51a05b am: 20def2e75f
am: 6e8fef24d9
Change-Id: I43f556df4700c9470a0df500eadddcbcd8146cf7
|
2016-11-14 13:39:25 +00:00 |
|
Narayan Kamath
|
df3e599c7d
|
Zygote : Block SIGCHLD during fork. am: b6f3751599 am: b23e864573 am: 52021073a4 am: 479385b6b3
am: 5f70cb0898
Change-Id: I16da70d1722e16ca61e31fff092ca778a5d66339
|
2016-11-14 13:39:05 +00:00 |
|
Narayan Kamath
|
2f2611636b
|
Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 am: 50b0c3be57 -s ours am: e1e735bcb9 am: 072b70bae3 am: ba6d5ee377 am: f3f784853d
am: 8ea47824fa
Change-Id: I6d31e839b51896830ae42ddad01581743fd4bd28
|
2016-11-14 13:38:01 +00:00 |
|
Narayan Kamath
|
6861821082
|
Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247 am: d98e75feca am: 87dc13f249 am: c50c43667f am: a5ff6c84a2
am: 9efaadccc0
Change-Id: I8a47806998957121f0de14e7e5bdb4d8e39944de
|
2016-11-14 13:37:08 +00:00 |
|
Narayan Kamath
|
44e645e59a
|
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485 am: a045aed7a2 am: 846f64c6fc am: 83b46a1590 am: 330d0ebf48 am: 21c1e58090 am: 81fd9e618c am: 2c13554c18
am: fb207962aa
Change-Id: Ifad8cb21043c498097bcd7c459773cdfdcc98560
|
2016-11-14 13:36:53 +00:00 |
|
Narayan Kamath
|
8ff9e7104c
|
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am: b3b03a9d78 am: ba23956c45 am: a20eebfab7 am: 8e6e5a157b am: 65abe1066d am: a13068a1c8 am: 3e85db46bc
am: 5ad1a52678
Change-Id: I0e6cfed1a3fac9ba0cf45c4148fbb7fe077fd624
|
2016-11-14 13:36:02 +00:00 |
|
Narayan Kamath
|
327edfeba2
|
Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f am: f8335b6a59 am: 2f8ce5f5cb am: 5515b415aa am: d212aa9d13 am: 3b89a68a08
am: 146a0f86a6
Change-Id: Ie77008fd0fcab39404ae817413096a0c10f88c6d
|
2016-11-14 13:35:51 +00:00 |
|
Narayan Kamath
|
9f37c28a17
|
Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e am: d501e032d8 am: 932cd0ed0e am: d17867203b am: 59e6dccb4c am: 53af5fe3f7 am: 56294db4d4
am: 8fecc8687b
Change-Id: Ie17f7a15e86b88d9fef7edc43919bc3669ba5acf
|
2016-11-14 13:35:02 +00:00 |
|
Narayan Kamath
|
58d1705c64
|
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am: d60156dfc6 am: fd23b9d509 am: b0a7831375 am: 5594cfc2c3 am: 6ca924b884 am: ae457e03b7 am: 0c8da8aa05 am: 1f9abe310f
am: f45a1a0fe6
Change-Id: Ie1cabf78ed27b3110e9b89c45c4fd02a4985231d
|
2016-11-14 13:34:42 +00:00 |
|
Hugo Benichi
|
fb2b64d037
|
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167 am: 3d9a2d7206 am: e40917b1ae am: afa3694ea9 am: 37cacc77ce am: 4bdf37c204 am: fd3e6e8d25
am: bfa2fed779
Change-Id: I7c2d9158c7395a35b92ad74535cff704e6b897f4
|
2016-11-14 13:33:55 +00:00 |
|
Narayan Kamath
|
83be5fdebb
|
Zygote: Additional whitelists for runtime overlay / other static resources. am: 0ad0e859f6 am: 1e6a5d11a6 am: f0cd32619e -s ours am: 4c26a969e9 am: b7884e5a9f am: da65c74c54 am: 24b2a54a84 am: 4a204149eb
am: e58ee798c1
Change-Id: Ia1e984acaff549a83d4ab6373a9becc89bfd66ce
|
2016-11-14 13:33:24 +00:00 |
|
Hugo Benichi
|
6db87b6e2a
|
DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev am: 476da32d86 -s ours am: bdf4d8a93c am: 1d61b01a5d
am: 9a6f65608a
Change-Id: I91630e0cdfff69cfcea1e680fae1db34541cc8de
|
2016-11-14 13:32:50 +00:00 |
|
Xin Li
|
f3e0e13b54
|
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fcec -s ours am: 16090c6177 -s ours am: 0a568ae56e am: 9788dd5bd2 am: 6ec8dd10bb am: 921dd6a5fd -s ours am: 05a61276c6 am: 23270f1311
am: 5386c74a44
Change-Id: I122525c6a85e1542370835d88e83cad30f747bff
|
2016-11-14 13:30:19 +00:00 |
|
Narayan Kamath
|
05f59b1f1d
|
Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2 am: 77decadefe am: 11b3161c41 am: 5cbd448348
am: a9fae33c11
Change-Id: Idb4874c1c84d894bb20ac24dfc2c2035f9e1c10a
|
2016-11-14 13:29:01 +00:00 |
|
Narayan Kamath
|
9efaadccc0
|
Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247 am: d98e75feca am: 87dc13f249 am: c50c43667f
am: a5ff6c84a2
Change-Id: I62e2180c0a3b2d9e2a11b3ad4d93288bed1ccef6
|
2016-11-14 13:27:51 +00:00 |
|
Andriy Naborskyy
|
18305d920e
|
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am: 11da2b5de3 -s ours am: 3f39609cff -s ours
am: fb4beac069 -s ours
Change-Id: Id30081863fc467acb09bcc087596e3ec43aa3528
|
2016-11-14 13:26:16 +00:00 |
|