OSDN Git Service
Andriy Naborskyy [Mon, 14 Nov 2016 13:08:23 +0000 (13:08 +0000)]
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am:
c5bf8bc74d -s ours
am:
f380f53752 -s ours
Change-Id: I2b6441bfb380c443199a72ea61044a5480d93324
Brian Carlstrom [Mon, 14 Nov 2016 13:07:09 +0000 (13:07 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am:
5d0cabf78e am:
3be5dec18a
am:
b272d7cb13
Change-Id: If3d7584fef21c97c9dd9350b385c86bd0dfc1231
Narayan Kamath [Mon, 14 Nov 2016 13:05:54 +0000 (13:05 +0000)]
Zygote : Block SIGCHLD during fork. am:
b6f3751599 am:
b23e864573
am:
52021073a4
Change-Id: I2d82df99a5c2c4e3c7df0f54638531fb67271e25
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Andriy Naborskyy [Sat, 12 Nov 2016 03:28:20 +0000 (03:28 +0000)]
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"
am:
c5bf8bc74d -s ours
Change-Id: I1462680883342b4492094cf85a0b15a1f75c12e9
Brian Carlstrom [Fri, 11 Nov 2016 04:19:17 +0000 (04:19 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am:
5d0cabf78e
am:
3be5dec18a
Change-Id: Ib0a197c84b21a8f7ce40d0e4c56b2e8d8346804c
Narayan Kamath [Fri, 11 Nov 2016 04:18:07 +0000 (04:18 +0000)]
Zygote : Block SIGCHLD during fork. am:
b6f3751599
am:
b23e864573
Change-Id: I01281c04a6fba8ce2b7240b9654df3ff515fb8f6
Brian Carlstrom [Fri, 11 Nov 2016 04:11:38 +0000 (04:11 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev
am:
5d0cabf78e
Change-Id: I7df6aac34bab92746b226b622db56c7f9d1d8cef
Narayan Kamath [Fri, 11 Nov 2016 04:11:35 +0000 (04:11 +0000)]
Zygote : Block SIGCHLD during fork.
am:
b6f3751599
Change-Id: I1bc21b7ede2151803313cb3c827b051d4decf795
Brian Carlstrom [Fri, 11 Nov 2016 04:02:58 +0000 (04:02 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev
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
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
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
Narayan Kamath [Mon, 7 Nov 2016 16:22:48 +0000 (16:22 +0000)]
Zygote : Block SIGCHLD during fork.
We close the android logging related sockets prior as late as possible
before every fork to avoid having to whitelist them. If one of the
zygote's children dies after this point (but prior to the fork), we can
end up reopening the logging sockets from the SIGCHLD signal handler.
To prevent this from happening, block SIGCHLD during this critical
section.
Bug:
32693692
Test: Manual
(cherry picked from commit
e9a525829a354c92983a35455ccab16d1b0d3892)
Zygote: Unblock SIGCHLD in the parent after fork.
Follow up to change
e9a525829a354c92983a. Allows the zygote to
receive SIGCHLD again and prevents the zygote from getting into a
zombie state if it's killed.
Contributed-By: rhed_jao <rhed_jao@htc.com>
Bug:
32693692
Test: manual
(cherry picked from commit
c7161f756e86b98f2244a04d9207b47149965fd7)
Change-Id: If89903a29c84dfc9b056f9e19618046874bba689
(cherry picked from commit
dfcc79ee8ecd4166cba19be7493c6175cb0c65a9)
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Narayan Kamath [Thu, 10 Nov 2016 23:40:36 +0000 (23:40 +0000)]
Zygote: Additional whitelisting for legacy devices.
am:
5e2f7c6229
Change-Id: I36adcd8393eab2bb4421f9e3e72302c5db37422a
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
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
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
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
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
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
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
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
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
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
Narayan Kamath [Thu, 10 Nov 2016 11:05:42 +0000 (11:05 +0000)]
Zygote : Block SIGCHLD during fork.
am:
b1f1209d9a
Change-Id: I3658f583c82dd6243089aaa74ad731a5bfa85b01
Narayan Kamath [Mon, 7 Nov 2016 16:22:48 +0000 (16:22 +0000)]
Zygote : Block SIGCHLD during fork.
We close the android logging related sockets prior as late as possible
before every fork to avoid having to whitelist them. If one of the
zygote's children dies after this point (but prior to the fork), we can
end up reopening the logging sockets from the SIGCHLD signal handler.
To prevent this from happening, block SIGCHLD during this critical
section.
Bug:
32693692
Test: Manual
(cherry picked from commit
e9a525829a354c92983a35455ccab16d1b0d3892)
Zygote: Unblock SIGCHLD in the parent after fork.
Follow up to change
e9a525829a354c92983a. Allows the zygote to
receive SIGCHLD again and prevents the zygote from getting into a
zombie state if it's killed.
Contributed-By: rhed_jao <rhed_jao@htc.com>
Bug:
32693692
Test: manual
(cherry picked from commit
1480dc3e97b661f5bfa3a5c2fbce72385b8d2be6)
Change-Id: If89903a29c84dfc9b056f9e19618046874bba689
Narayan Kamath [Thu, 10 Nov 2016 10:04:09 +0000 (10:04 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev
Andriy Naborskyy [Thu, 10 Nov 2016 01:51:24 +0000 (01:51 +0000)]
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"
This reverts commit
80e6d8873b79ced40e79fcba0bf793ea6528d20c.
Bug:
32771832
Change-Id: Ia2f2ffd08dfd87cbce1ec750d6b61277799b536f
Hugo Benichi [Tue, 19 Jul 2016 06:59:27 +0000 (15:59 +0900)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission
This patch creates a new permission used by ConnectivityService to give
access to restricted networks without the NET_CAPABILITY_NOT_RESTRICTED
capability bit on.
Bug:
24497316
Change-Id: I5b6c8a9ef14395b2f1ab26cb17b24d7876ec79f1
Hugo Benichi [Thu, 10 Nov 2016 01:31:31 +0000 (10:31 +0900)]
resolve merge conflicts of
89aa6fb to mnc-dr-dev
Change-Id: I9e4e538081600be6a8199060bcb0d4040c071a22
Xin Li [Wed, 9 Nov 2016 20:36:11 +0000 (20:36 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am:
cc115c5931 am:
eda0b0078e am:
71e62a4058
am:
503661118a -s ours
Change-Id: I1dc24f01552359d8cdaea875f399878fa55ea2e0
Xin Li [Wed, 9 Nov 2016 20:34:42 +0000 (20:34 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am:
ee2903686f -s ours am:
6166af96ba am:
63c9a312a2
am:
84a9614947 -s ours
Change-Id: I0a1887ae82111b39e1dea53fadea452bc522c2ae
Narayan Kamath [Wed, 9 Nov 2016 20:31:32 +0000 (20:31 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am:
7bd25ab485 am:
a045aed7a2
am:
846f64c6fc
Change-Id: Id2d5000722d160df14dd33aa937a36388b971b76
Narayan Kamath [Wed, 9 Nov 2016 20:30:33 +0000 (20:30 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
7d302e018d am:
f369b3ce75
am:
e82866df3f
Change-Id: Icb4fcfc35784e5fbe913f8efb810879fd3011154
Narayan Kamath [Wed, 9 Nov 2016 20:29:37 +0000 (20:29 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am:
d60156dfc6 am:
fd23b9d509
am:
b0a7831375
Change-Id: Ifb6032bd3c392ad90236b2ecaa18fa53894c4620
Narayan Kamath [Wed, 9 Nov 2016 20:28:35 +0000 (20:28 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
0ad0e859f6 am:
1e6a5d11a6
am:
f0cd32619e -s ours
Change-Id: I1b1a0428d1cc49ee4096f5459a5aa1a1f62ed700
neo.chae [Wed, 9 Nov 2016 20:25:12 +0000 (20:25 +0000)]
Fix idmap leak in zygote process am:
0244ca8d10 am:
82537abc3b
am:
85afb42c16
Change-Id: Ibb5ac24b2149637bf19b9a16153b1fcde5dbb45f
Xin Li [Wed, 9 Nov 2016 20:24:23 +0000 (20:24 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am:
cc115c5931 am:
eda0b0078e
am:
71e62a4058
Change-Id: I0d66e9689c9ec4a2537cdd23a73ec4dbb74cfd1a
Xin Li [Wed, 9 Nov 2016 20:24:12 +0000 (20: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
Change-Id: Ifbc0ae4b514592e5e731b555bd4d393e46ad136d
Xin Li [Wed, 9 Nov 2016 20:23:04 +0000 (20:23 +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
Change-Id: I25ba4f5731ecaed22faa95e3948e389405dca7e7
Xin Li [Wed, 9 Nov 2016 20:23:01 +0000 (20:23 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am:
ee2903686f -s ours am:
6166af96ba
am:
63c9a312a2
Change-Id: I5123223d1ba04f94d52261ab77d6ec33a0c7dc75
Xin Li [Wed, 9 Nov 2016 20:17:53 +0000 (20:17 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am:
cc115c5931
am:
eda0b0078e
Change-Id: Ibf745e727c36dd04b5cb30b574cca4b5709b9f4b
Narayan Kamath [Wed, 9 Nov 2016 20:17:01 +0000 (20:17 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am:
7bd25ab485
am:
a045aed7a2
Change-Id: Iec015c0607286511a0d82db7fd6c82f6e17379aa
Xin Li [Wed, 9 Nov 2016 20:17:00 +0000 (20:17 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am:
ee2903686f -s ours
am:
6166af96ba
Change-Id: I591eb39cc8f7e3528a35ae1d98f641fdf12c4082
Narayan Kamath [Wed, 9 Nov 2016 20:16:06 +0000 (20:16 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
7d302e018d
am:
f369b3ce75
Change-Id: Id0794434479585b2cf4b4996256a3cb9374fd9a7
Narayan Kamath [Wed, 9 Nov 2016 20:15:05 +0000 (20:15 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am:
d60156dfc6
am:
fd23b9d509
Change-Id: I86ad3b0fe5c3da67014540c1aa35c4326ee4f33b
Narayan Kamath [Wed, 9 Nov 2016 20:14:07 +0000 (20:14 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
0ad0e859f6
am:
1e6a5d11a6
Change-Id: Ia98abb9cb437dd3c42b80de5c0cd98c965e6603e
neo.chae [Wed, 9 Nov 2016 20:13:07 +0000 (20:13 +0000)]
Fix idmap leak in zygote process am:
0244ca8d10
am:
82537abc3b
Change-Id: I83d338ebfdefd0f935c4cfb14c3b15efca1cce0f
Xin Li [Wed, 9 Nov 2016 20:11:44 +0000 (20:11 +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
Change-Id: I5f5509cd98a6a98ce9edc782e9d8ef9093fa86e4
Xin Li [Wed, 9 Nov 2016 20:11:42 +0000 (20:11 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev
am:
cc115c5931
Change-Id: I9e226ffdca4c3633061f0202da367e2be0eeeb1f
Xin Li [Wed, 9 Nov 2016 20:11:40 +0000 (20:11 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev.
am:
7e0483fcec -s ours
Change-Id: I3a351771548f827aeecf9a4c8305b907c106abc5
Xin Li [Wed, 9 Nov 2016 20:11:37 +0000 (20:11 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev.
am:
ee2903686f -s ours
Change-Id: I565953c9962f328055512615185de735c33a50bb
OSDN Git Service
