git.osdn.net Git - android-x86/frameworks-base.git/log

Narayan Kamath [Mon, 14 Nov 2016 13:38:01 +0000 (13:38 +0000)]

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

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:36:53 +0000 (13:36 +0000)]

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

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:35:51 +0000 (13:35 +0000)]

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

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:34:42 +0000 (13:34 +0000)]

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

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:33:24 +0000 (13:33 +0000)]

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

commit | commitdiff | tree

neo.chae [Mon, 14 Nov 2016 13:25:11 +0000 (13:25 +0000)]

Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e am: fb74b8773a am: c58ec27e1c am: 7489336fed am: 0212d4f3fa
am: aaf785c827

Change-Id: I34d0175499e1a47e3e6c9aecd2ac2805a6b4ad51

commit | commitdiff | tree

Xin Li [Mon, 14 Nov 2016 13:24:00 +0000 (13:24 +0000)]

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

Change-Id: If0d5a1c14c181a8a476a00b66c9f8ba279f597e8

commit | commitdiff | tree

Xin Li [Mon, 14 Nov 2016 13:22:41 +0000 (13:22 +0000)]

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

Change-Id: I242883361ff06daefe80686314e8869a3b6733f4

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:21:40 +0000 (13:21 +0000)]

Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 am: 50b0c3be57 -s ours am: e1e735bcb9 am: 072b70bae3 am: ba6d5ee377
am: f3f784853d

Change-Id: Ia7aa7669db2bce172e325cb2c70facb3ca149974

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:21:23 +0000 (13:21 +0000)]

Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2 am: 77decadefe am: 11b3161c41
am: 5cbd448348

Change-Id: I8c2fd9f5e060fabe7fe5bc4e628f62d9de2f4769

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:20:05 +0000 (13:20 +0000)]

Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247 am: d98e75feca am: 87dc13f249
am: c50c43667f

Change-Id: I11f57941eb00efafb14e0505131e66bc22fc68c6

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:18:23 +0000 (13:18 +0000)]

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

Change-Id: Iaba405222437a1a6df61c2de1b55d46110b7baac

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:17:13 +0000 (13:17 +0000)]

Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f am: f8335b6a59 am: 2f8ce5f5cb am: 5515b415aa am: d212aa9d13
am: 3b89a68a08

Change-Id: I7eb37e002025b94267846d45680f24c3901fada9

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:15:59 +0000 (13:15 +0000)]

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

Change-Id: I016ca17b09b2aa1ca3286f21ab6a534933482d1b

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:15:47 +0000 (13:15 +0000)]

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

Change-Id: I3aa51cf70829614ffcc3598e20eba6e9036d6790

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:14:47 +0000 (13:14 +0000)]

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

Change-Id: Ic51bd970889a267e911f6171bd56e955b8ecac63

commit | commitdiff | tree

neo.chae [Mon, 14 Nov 2016 13:13:48 +0000 (13:13 +0000)]

Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e am: fb74b8773a am: c58ec27e1c am: 7489336fed
am: 0212d4f3fa

Change-Id: I9ea05d641c04178d067c35ae5d2f87ee35c86924

commit | commitdiff | tree

Xin Li [Mon, 14 Nov 2016 13:12:42 +0000 (13:12 +0000)]

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

Change-Id: I114b678f9a47837a97758693f4c0e64e8eb17298

commit | commitdiff | tree

Xin Li [Mon, 14 Nov 2016 13:11:30 +0000 (13:11 +0000)]

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

Change-Id: I45d14e29bd7791cd3bd8fcca887478d8ac88d37a

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:10:53 +0000 (13:10 +0000)]

Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e am: d501e032d8 am: 932cd0ed0e am: d17867203b am: 59e6dccb4c
am: 53af5fe3f7

Change-Id: If824016f0535d121404b08c36b43a1ce0f168d13

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:10:17 +0000 (13:10 +0000)]

Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2 am: 77decadefe
am: 11b3161c41

Change-Id: Ia63281de50ffd23664671780c2d75155dbc66260

commit | commitdiff | tree

Hugo Benichi [Mon, 14 Nov 2016 13:09:34 +0000 (13:09 +0000)]

Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167 am: 3d9a2d7206 am: e40917b1ae am: afa3694ea9 am: 37cacc77ce
am: 4bdf37c204

Change-Id: Ida3b6e2739f273228826f1536e2573d9456c2956

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:09:06 +0000 (13:09 +0000)]

Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247 am: d98e75feca
am: 87dc13f249

Change-Id: I7e23610ef0799dcfb3ac3598011280de22ffc25f

commit | commitdiff | tree

Hugo Benichi [Mon, 14 Nov 2016 13:08:26 +0000 (13:08 +0000)]

DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev am: 476da32d86 -s ours
am: bdf4d8a93c

Change-Id: Ifc38d9a9e7afedd6bf5af2876f4d1dfdf430dd02

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:07:49 +0000 (13:07 +0000)]

Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am: b3b03a9d78 am: ba23956c45 am: a20eebfab7 am: 8e6e5a157b
am: 65abe1066d

Change-Id: Id11cf7f2b1dbf1db6eb047f1e2015689d733ab69

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:04:33 +0000 (13:04 +0000)]

Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 am: 50b0c3be57 -s ours am: e1e735bcb9 am: 072b70bae3
am: ba6d5ee377

Change-Id: Id7fefda1a09fc4af9232cd1acb28092c2fd1b93c

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:03:02 +0000 (13:03 +0000)]

Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485 am: a045aed7a2 am: 846f64c6fc am: 83b46a1590 am: 330d0ebf48 am: 21c1e58090
am: 81fd9e618c

Change-Id: I1a30989e0fd2ced4a7e298ae26e76f3525c03362

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:01:42 +0000 (13:01 +0000)]

Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f am: f8335b6a59 am: 2f8ce5f5cb am: 5515b415aa
am: d212aa9d13

Change-Id: I477b2582bd31e1f9d1b53ea6bfdad78267fc6bfc

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 13:00:21 +0000 (13:00 +0000)]

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

Change-Id: Iaa46542e0484c3a9e175f492790583482b4f088b

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 12:59:01 +0000 (12:59 +0000)]

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

Change-Id: I11ecc3013e1de3951b12945c486cca7ad78d38ed

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 12:57:59 +0000 (12:57 +0000)]

Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e am: d501e032d8 am: 932cd0ed0e am: d17867203b
am: 59e6dccb4c

Change-Id: I210a7f36c6bef41c62a12c0b84e3b054f7aebf99

commit | commitdiff | tree

neo.chae [Mon, 14 Nov 2016 12:57:53 +0000 (12:57 +0000)]

Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e am: fb74b8773a am: c58ec27e1c
am: 7489336fed

Change-Id: I53fb00542e417e200b46ac941b4255e310348e18

commit | commitdiff | tree

Hugo Benichi [Mon, 14 Nov 2016 12:56:47 +0000 (12:56 +0000)]

Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167 am: 3d9a2d7206 am: e40917b1ae am: afa3694ea9
am: 37cacc77ce

Change-Id: I7c5bc81af38a6b6a3ea26f64ae5c1773a91f1bf6

commit | commitdiff | tree

Xin Li [Mon, 14 Nov 2016 12:56:36 +0000 (12:56 +0000)]

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

Change-Id: Ib1df6a08c3f6a2e379f7d4ffac944c2169336f11

commit | commitdiff | tree

Hugo Benichi [Mon, 14 Nov 2016 12:55:35 +0000 (12:55 +0000)]

DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev
am: 476da32d86 -s ours

Change-Id: Ic4ff5e0c392488315659bef421535d43ac115e6f

commit | commitdiff | tree

Xin Li [Mon, 14 Nov 2016 12:55:17 +0000 (12:55 +0000)]

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

Change-Id: Iffc4ed4a45701d533a0b6d24daaa137982554057

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 12:54:10 +0000 (12:54 +0000)]

Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2
am: 77decadefe

Change-Id: I41f78ad8e6d669cb1e038480adfd9d12a469500c

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 12:52:53 +0000 (12:52 +0000)]

Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247
am: d98e75feca

Change-Id: Ic63a80f3a591956fd82a223c74050a24d7805add

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 12:51:41 +0000 (12:51 +0000)]

Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am: b3b03a9d78 am: ba23956c45 am: a20eebfab7
am: 8e6e5a157b

Change-Id: Ie00c71b1bef751c2f0b039a5a150fc6971fbf415

commit | commitdiff | tree

Narayan Kamath [Mon, 14 Nov 2016 12:50:15 +0000 (12:50 +0000)]

Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e am: d501e032d8 am: 932cd0ed0e
am: d17867203b

Change-Id: I2d230bcbb539def3db3da59e45e0c1e86ff13a2b

commit | commitdiff | tree

Hugo Benichi [Mon, 14 Nov 2016 12:49:00 +0000 (12:49 +0000)]

Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167 am: 3d9a2d7206 am: e40917b1ae
am: afa3694ea9

Change-Id: I7ac1eb75c3bde52332875e992124407e6cfd5417

commit | commitdiff | tree

Hugo Benichi [Fri, 11 Nov 2016 02:24:23 +0000 (11:24 +0900)]

DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev

Change-Id: I854eddda678934d0da083d22b99b855ed57fd644

commit | commitdiff | tree

Kevin Hufnagle [Fri, 11 Nov 2016 22:44:01 +0000 (22:44 +0000)]

Merge "App Shortcut: Clarify which attributes must be resources" into nyc-mr1-dev

commit | commitdiff | tree

Yigit Boyar [Fri, 11 Nov 2016 22:14:11 +0000 (22:14 +0000)]

Merge "List all methods that change data in the docs" into nyc-mr1-dev

commit | commitdiff | tree

Narayan Kamath [Fri, 11 Nov 2016 02:09:32 +0000 (02:09 +0000)]

Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 am: 50b0c3be57 -s ours am: e1e735bcb9
am: 072b70bae3

Change-Id: I15a813590f1e8aed95f2f7614971b40113b17521

commit | commitdiff | tree

Narayan Kamath [Fri, 11 Nov 2016 02:03:00 +0000 (02:03 +0000)]

Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 am: 50b0c3be57 -s ours
am: e1e735bcb9

Change-Id: I07af6efeed14cabe3aa7d41b2a9eaad2ccff62c6

commit | commitdiff | tree

Narayan Kamath [Fri, 11 Nov 2016 01:56:28 +0000 (01:56 +0000)]

Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79
am: 50b0c3be57 -s ours

Change-Id: I745d1c8e0066b0a7864d931b268b04a9458c7984

commit | commitdiff | tree

Narayan Kamath [Fri, 11 Nov 2016 00:20:49 +0000 (00:20 +0000)]

Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485 am: a045aed7a2 am: 846f64c6fc am: 83b46a1590 am: 330d0ebf48
am: 21c1e58090

Change-Id: I727c4f15ee448458b4ce0dca19dfa6ef89be4d71

commit | commitdiff | tree

Narayan Kamath [Fri, 11 Nov 2016 00:19:45 +0000 (00:19 +0000)]

Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f am: f8335b6a59 am: 2f8ce5f5cb
am: 5515b415aa

Change-Id: Ib11c35d24511dab4c733f887677b0d72e044162a

commit | commitdiff | tree

Narayan Kamath [Fri, 11 Nov 2016 00:18:44 +0000 (00:18 +0000)]

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

Change-Id: Ieeb3396bed2fbca0dc762d9884be48f75c62db0d

commit | commitdiff | tree

Narayan Kamath [Fri, 11 Nov 2016 00:17:48 +0000 (00:17 +0000)]

Zygote: Additional whitelists for runtime overlay / other static resources. am: 0ad0e859f6 am: 1e6a5d11a6 am: f0cd32619e -s ours am: 4c26a969e9 am: b7884e5a9f
am: da65c74c54

Change-Id: Ic5429b9bb2a26c08b03b39550754afb58f9827ba

commit | commitdiff | tree

neo.chae [Fri, 11 Nov 2016 00:16:46 +0000 (00:16 +0000)]

Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e am: fb74b8773a
am: c58ec27e1c

Change-Id: Id44b030b79e924a7d619288b2fc0926d7a536111

commit | commitdiff | tree

Xin Li [Fri, 11 Nov 2016 00:13:50 +0000 (00:13 +0000)]

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

Change-Id: I0a88888750b666eb24c5ba4ad4f08346e36a5bca

commit | commitdiff | tree

Xin Li [Fri, 11 Nov 2016 00:12:50 +0000 (00:12 +0000)]

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

Change-Id: Ied2074dc34507fcb0dcfca6d68c8780f00dd0bc0

commit | commitdiff | tree

Narayan Kamath [Fri, 11 Nov 2016 00:11:45 +0000 (00:11 +0000)]

Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180
am: 5e92ece8c2

Change-Id: Ia4a0127a904516fc6eeaccf318f3fb9f4de0e7f9

commit | commitdiff | tree

Narayan Kamath [Fri, 11 Nov 2016 00:10:31 +0000 (00:10 +0000)]

Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192
am: 22e45fa247

Change-Id: I70befe1803e89e9e2bbcaa70738cf53b16ec7280

commit | commitdiff | tree

Narayan Kamath [Fri, 11 Nov 2016 00:09:32 +0000 (00:09 +0000)]

Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am: b3b03a9d78 am: ba23956c45
am: a20eebfab7

Change-Id: I8a6859c90c2ce2f0ba532fd43b214d759889ae25

commit | commitdiff | tree

Narayan Kamath [Fri, 11 Nov 2016 00:07:12 +0000 (00:07 +0000)]

Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485 am: a045aed7a2 am: 846f64c6fc am: 83b46a1590
am: 330d0ebf48

Change-Id: I0205706d025ea0609c22fec008ea1c954a618f63

commit | commitdiff | tree

Narayan Kamath [Fri, 11 Nov 2016 00:06:09 +0000 (00:06 +0000)]

Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f am: f8335b6a59
am: 2f8ce5f5cb

Change-Id: Icad715644a83a7d37ab49be465d7761f4f22c9af

commit | commitdiff | tree

Narayan Kamath [Fri, 11 Nov 2016 00:05:13 +0000 (00:05 +0000)]

Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am: d60156dfc6 am: fd23b9d509 am: b0a7831375 am: 5594cfc2c3
am: 6ca924b884

Change-Id: Ia63b73c73eb5d8b1a98e95807e1a5fa0280cdeb7

commit | commitdiff | tree

Narayan Kamath [Fri, 11 Nov 2016 00:04:27 +0000 (00:04 +0000)]

Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e am: d501e032d8
am: 932cd0ed0e

Change-Id: Iadfa4ef7ca1537df9c9a0d53bb75dce0f64be567

commit | commitdiff | tree

Narayan Kamath [Fri, 11 Nov 2016 00:04:09 +0000 (00:04 +0000)]

Zygote: Additional whitelists for runtime overlay / other static resources. am: 0ad0e859f6 am: 1e6a5d11a6 am: f0cd32619e -s ours am: 4c26a969e9
am: b7884e5a9f

Change-Id: Ice56c0d81f57757cb9e238cd20c5d968142b8bdd

commit | commitdiff | tree

Hugo Benichi [Fri, 11 Nov 2016 00:03:26 +0000 (00:03 +0000)]

Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167 am: 3d9a2d7206
am: e40917b1ae

Change-Id: I69225098ff2d75aa1a3f5245c0703c06282c7441

commit | commitdiff | tree

neo.chae [Fri, 11 Nov 2016 00:02:56 +0000 (00:02 +0000)]

Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e
am: fb74b8773a

Change-Id: I4a2630b7217462897070029a613489c7909aedf6

commit | commitdiff | tree

Xin Li [Fri, 11 Nov 2016 00:01:56 +0000 (00:01 +0000)]

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

Change-Id: Ia45feea279ef24afe3450108fc63343461abf7ea

commit | commitdiff | tree

Xin Li [Fri, 11 Nov 2016 00:00:49 +0000 (00:00 +0000)]

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

Change-Id: I317b0be7182896e39fd23b152ff08ebf4de37592

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Nov 2016 23:59:49 +0000 (23:59 +0000)]

Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324
am: 9958eb7180

Change-Id: I1fd9dd6f8326ab7077c62fccde6dc508a971db3e

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Nov 2016 23:58:54 +0000 (23:58 +0000)]

Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229
am: 6bf96c1192

Change-Id: I65bc57fa4fe9fa1257ce0f4b5836616594643234

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Nov 2016 23:57:55 +0000 (23:57 +0000)]

Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am: b3b03a9d78
am: ba23956c45

Change-Id: I0b1c263050e6c15f1d6915bd86b14f257c92e9eb

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Nov 2016 23:56:58 +0000 (23:56 +0000)]

Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e
am: d501e032d8

Change-Id: I97c4e04554c2da5bee56dc741cf71c7d2f1cba60

commit | commitdiff | tree

Hugo Benichi [Thu, 10 Nov 2016 23:55:53 +0000 (23:55 +0000)]

Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167
am: 3d9a2d7206

Change-Id: I00250433819d7b04a101f747da100c0d13a0adcb

commit | commitdiff | tree

Hugo Benichi [Thu, 10 Nov 2016 23:55:50 +0000 (23:55 +0000)]

resolve merge conflicts of 89aa6fb to mnc-dr-dev am: a0cfb157ec
am: 0e013c9b9f

Change-Id: Iab130296a52ba31005344793ed07c22003ac729f

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Nov 2016 23:48:38 +0000 (23:48 +0000)]

Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485 am: a045aed7a2 am: 846f64c6fc
am: 83b46a1590

Change-Id: Ib859c8848a05004a5de36aaf67b4dd3ac72899e9

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Nov 2016 23:47:45 +0000 (23:47 +0000)]

Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f
am: f8335b6a59

Change-Id: Iecd1ad8590d30eea4031eeeea3d455199221379c

commit | commitdiff | tree

Hugo Benichi [Thu, 10 Nov 2016 23:46:53 +0000 (23:46 +0000)]

resolve merge conflicts of 89aa6fb to mnc-dr-dev
am: a0cfb157ec

Change-Id: I10ee0e4e8ef8a1785a16f6f83b8bb38b8847e85a

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Nov 2016 23:46:36 +0000 (23:46 +0000)]

Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am: d60156dfc6 am: fd23b9d509 am: b0a7831375
am: 5594cfc2c3

Change-Id: I04a81810d474bedf7a8fcc4e089a95e1c7c030ba

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Nov 2016 23:45:32 +0000 (23:45 +0000)]

Zygote: Additional whitelists for runtime overlay / other static resources. am: 0ad0e859f6 am: 1e6a5d11a6 am: f0cd32619e -s ours
am: 4c26a969e9

Change-Id: I708b2d077eaad2c7bcf7d39a0d0449a5265779f1

commit | commitdiff | tree

neo.chae [Thu, 10 Nov 2016 23:44:32 +0000 (23:44 +0000)]

Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16
am: b4b2203c5e

Change-Id: Ifd540b5f9cb1e32a002ed86c67eda30189f4e23f

commit | commitdiff | tree

Xin Li [Thu, 10 Nov 2016 23:43:39 +0000 (23:43 +0000)]

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

Change-Id: I5ee94abbb8f6f4e8f98e8b81349ba58da3601407

commit | commitdiff | tree

Xin Li [Thu, 10 Nov 2016 23:42:19 +0000 (23:42 +0000)]

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

Change-Id: I49e2be8c77a13c939fe5f7bf6c16e0e80fb3bbbb

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Nov 2016 23:40:40 +0000 (23:40 +0000)]

Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev
am: 75c6b8c324

Change-Id: I4fb2f20ad4391915fe4ea734158274af5e879e10

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Nov 2016 23:40:36 +0000 (23:40 +0000)]

Zygote: Additional whitelisting for legacy devices.
am: 5e2f7c6229

Change-Id: I36adcd8393eab2bb4421f9e3e72302c5db37422a

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Nov 2016 23:39:07 +0000 (23:39 +0000)]

Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev
am: b3b03a9d78

Change-Id: Iafd7fc34df0fb88710003ea94219301d77ca78ed

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Nov 2016 23:39:03 +0000 (23:39 +0000)]

Zygote: Additional whitelists for runtime overlay / other static resources.
am: 4e8ba1d73e

Change-Id: I52347c0024cc230d6e3db739eaafd78989c18430

commit | commitdiff | tree

Hugo Benichi [Thu, 10 Nov 2016 23:37:51 +0000 (23:37 +0000)]

Merge "DhcpClient: guard against failure to parse packets" into mnc-dev
am: fce4e43167

Change-Id: I9bf79e439213358381668b8c15d2d3061fa1170d

commit | commitdiff | tree

Chris Elliott [Thu, 10 Nov 2016 18:37:44 +0000 (18:37 +0000)]

Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am: 06a55fb553 -s ours am: 0e11e0d961 -s ours am: 69246f0565 -s ours
am: a8a116b001 -s ours

Change-Id: I02d089dca4dd0ee9808f77dce0957b1cfaf6c87d

commit | commitdiff | tree

Hugo Benichi [Thu, 10 Nov 2016 18:36:30 +0000 (18:36 +0000)]

DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508bd3e -s ours am: da695f5fdb -s ours am: 69d565b12d -s ours
am: 37779485b7 -s ours

Change-Id: I42aabc35fa30e242125015eac1b7d32790cc4528

commit | commitdiff | tree

Chris Elliott [Thu, 10 Nov 2016 18:25:11 +0000 (18:25 +0000)]

Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am: 06a55fb553 -s ours am: 0e11e0d961 -s ours
am: 69246f0565 -s ours

Change-Id: I8181f07829ea7e77986a0f4537a61e4060c1176e

commit | commitdiff | tree

Hugo Benichi [Thu, 10 Nov 2016 18:23:58 +0000 (18:23 +0000)]

DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508bd3e -s ours am: da695f5fdb -s ours
am: 69d565b12d -s ours

Change-Id: Ibe074076d22a736394a01d27aa9e1c7ed73458b2

commit | commitdiff | tree

Chris Elliott [Thu, 10 Nov 2016 18:12:17 +0000 (18:12 +0000)]

Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am: 06a55fb553 -s ours
am: 0e11e0d961 -s ours

Change-Id: I800746b8b1fc8e63eb78a83632d9eaac9abebcd2

commit | commitdiff | tree

Hugo Benichi [Thu, 10 Nov 2016 18:11:02 +0000 (18:11 +0000)]

DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am: f88508bd3e -s ours
am: da695f5fdb -s ours

Change-Id: If1903ace2a31d8ccf3c66916211a07ac342fc360

commit | commitdiff | tree

Chris Elliott [Thu, 10 Nov 2016 18:04:28 +0000 (18:04 +0000)]

Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev
am: 06a55fb553 -s ours

Change-Id: I3e0facc6ff6dff0109452fe36f89a4eefe7676e1

commit | commitdiff | tree

Hugo Benichi [Thu, 10 Nov 2016 18:04:26 +0000 (18:04 +0000)]

DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission
am: f88508bd3e -s ours

Change-Id: I2ba3b591df623298f41e92e6f0d067a6fcf30533

commit | commitdiff | tree

Chris Elliott [Thu, 10 Nov 2016 17:48:19 +0000 (17:48 +0000)]

Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Nov 2016 11:17:48 +0000 (11:17 +0000)]

Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338
am: 14bd75fa79

Change-Id: I9b2acc6d40cc0f4724598f97b704c040bba15417

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Nov 2016 11:12:11 +0000 (11:12 +0000)]

Zygote : Block SIGCHLD during fork. am: b1f1209d9a
am: 35b8453338

Change-Id: I7c73b1a37d79f31ad8fff6d0b83426debbfd88f9

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Nov 2016 11:05:42 +0000 (11:05 +0000)]

Zygote : Block SIGCHLD during fork.
am: b1f1209d9a

Change-Id: I3658f583c82dd6243089aaa74ad731a5bfa85b01

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Nov 2016 10:23:00 +0000 (10:23 +0000)]

Merge "Zygote : Block SIGCHLD during fork." into nyc-dev am: a67112ca92
am: c0df29dfbc

Change-Id: I5a77286ff7758d3c7aaa1a2bd14588e8dd5216d5

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Nov 2016 10:21:57 +0000 (10:21 +0000)]

Zygote : Block SIGCHLD during fork. am: dfcc79ee8e
am: 720fcbc1f7

Change-Id: I18aeb47e1a4f061d5afe55a2aa936ae1d1cc61ff

commit | commitdiff | tree

Narayan Kamath [Thu, 10 Nov 2016 10:15:59 +0000 (10:15 +0000)]

Merge "Zygote : Block SIGCHLD during fork." into nyc-dev
am: a67112ca92

Change-Id: Ib8bef283e74694a415dc73f2c16b4de3b201798e