drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
247,257 Commits 1 Branch 0 Tags
Commit Graph

247257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andriy Naborskyy
fb4beac069 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

Change-Id: I2d9f5bf351026cd697b75b1c60a177232cdb2266
 2016-11-14 13:09:40 +00:00
Andriy Naborskyy
dbbde14239 DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am: c5bf8bc74d -s ours 
am: f380f53752  -s ours

Change-Id: I2b6441bfb380c443199a72ea61044a5480d93324
 2016-11-14 13:08:23 +00:00
Brian Carlstrom
f9150bf362 Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am: 5d0cabf78e am: 3be5dec18a 
am: b272d7cb13

Change-Id: If3d7584fef21c97c9dd9350b385c86bd0dfc1231
 2016-11-14 13:07:09 +00:00
Narayan Kamath
479385b6b3 Zygote : Block SIGCHLD during fork. am: b6f3751599 am: b23e864573 
am: 52021073a4

Change-Id: I2d82df99a5c2c4e3c7df0f54638531fb67271e25
 2016-11-14 13:05:54 +00:00
Narayan Kamath
f3f784853d Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 am: 50b0c3be57 -s ours am: e1e735bcb9 am: 072b70bae3 
am: ba6d5ee377

Change-Id: Id7fefda1a09fc4af9232cd1acb28092c2fd1b93c
 2016-11-14 13:04:33 +00:00
Narayan Kamath
2c13554c18 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
 2016-11-14 13:03:02 +00:00
Narayan Kamath
3b89a68a08 Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f am: f8335b6a59 am: 2f8ce5f5cb am: 5515b415aa 
am: d212aa9d13

Change-Id: I477b2582bd31e1f9d1b53ea6bfdad78267fc6bfc
 2016-11-14 13:01:42 +00:00
Narayan Kamath
1f9abe310f 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
 2016-11-14 13:00:21 +00:00
Narayan Kamath
4a204149eb 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
 2016-11-14 12:59:01 +00:00
neo.chae
0212d4f3fa Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e am: fb74b8773a am: c58ec27e1c 
am: 7489336fed

Change-Id: I53fb00542e417e200b46ac941b4255e310348e18
 2016-11-14 12:57:53 +00:00
Xin Li
ee6b51a05b 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
 2016-11-14 12:56:36 +00:00
Xin Li
05a61276c6 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
 2016-11-14 12:55:17 +00:00
Narayan Kamath
11b3161c41 Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2 
am: 77decadefe

Change-Id: I41f78ad8e6d669cb1e038480adfd9d12a469500c
 2016-11-14 12:54:10 +00:00
Narayan Kamath
87dc13f249 Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247 
am: d98e75feca

Change-Id: Ic63a80f3a591956fd82a223c74050a24d7805add
 2016-11-14 12:52:53 +00:00
Narayan Kamath
65abe1066d Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am: b3b03a9d78 am: ba23956c45 am: a20eebfab7 
am: 8e6e5a157b

Change-Id: Ie00c71b1bef751c2f0b039a5a150fc6971fbf415
 2016-11-14 12:51:41 +00:00
Narayan Kamath
59e6dccb4c Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e am: d501e032d8 am: 932cd0ed0e 
am: d17867203b

Change-Id: I2d230bcbb539def3db3da59e45e0c1e86ff13a2b
 2016-11-14 12:50:15 +00:00
Hugo Benichi
37cacc77ce Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167 am: 3d9a2d7206 am: e40917b1ae 
am: afa3694ea9

Change-Id: I7ac1eb75c3bde52332875e992124407e6cfd5417
 2016-11-14 12:49:00 +00:00
Hugo Benichi
476da32d86 DO NOT MERGE resolve merge conflicts of b446883 to nyc-dev 
Change-Id: I854eddda678934d0da083d22b99b855ed57fd644
 2016-11-14 21:35:45 +09:00
Andriy Naborskyy
3f39609cff Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev 
am: 11da2b5de3  -s ours

Change-Id: Ibbb6d37d5c08204c70cf03f0a7d18c9978a5c97d
 2016-11-12 03:28:22 +00:00
Andriy Naborskyy
f380f53752 DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" 
am: c5bf8bc74d  -s ours

Change-Id: I1462680883342b4492094cf85a0b15a1f75c12e9
 2016-11-12 03:28:20 +00:00
Andriy Naborskyy
11da2b5de3 Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev 2016-11-12 03:18:55 +00:00
Brian Carlstrom
b272d7cb13 Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am: 5d0cabf78e 
am: 3be5dec18a

Change-Id: Ib0a197c84b21a8f7ce40d0e4c56b2e8d8346804c
 2016-11-11 04:19:17 +00:00
Narayan Kamath
52021073a4 Zygote : Block SIGCHLD during fork. am: b6f3751599 
am: b23e864573

Change-Id: I01281c04a6fba8ce2b7240b9654df3ff515fb8f6
 2016-11-11 04:18:07 +00:00
Brian Carlstrom
3be5dec18a Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev 
am: 5d0cabf78e

Change-Id: I7df6aac34bab92746b226b622db56c7f9d1d8cef
 2016-11-11 04:11:38 +00:00
Narayan Kamath
b23e864573 Zygote : Block SIGCHLD during fork. 
am: b6f3751599

Change-Id: I1bc21b7ede2151803313cb3c827b051d4decf795
 2016-11-11 04:11:35 +00:00
Brian Carlstrom
5d0cabf78e Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev 2016-11-11 04:03:02 +00:00
Narayan Kamath
ba6d5ee377 Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 am: 50b0c3be57 -s ours am: e1e735bcb9 
am: 072b70bae3

Change-Id: I15a813590f1e8aed95f2f7614971b40113b17521
 2016-11-11 02:09:32 +00:00
Narayan Kamath
072b70bae3 Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 am: 50b0c3be57 -s ours 
am: e1e735bcb9

Change-Id: I07af6efeed14cabe3aa7d41b2a9eaad2ccff62c6
 2016-11-11 02:03:00 +00:00
Narayan Kamath
e1e735bcb9 Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 
am: 50b0c3be57  -s ours

Change-Id: I745d1c8e0066b0a7864d931b268b04a9458c7984
 2016-11-11 01:56:28 +00:00
Narayan Kamath
b6f3751599 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)
 2016-11-11 01:21:35 +00:00
Narayan Kamath
81fd9e618c 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
 2016-11-11 00:20:49 +00:00
Narayan Kamath
d212aa9d13 Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f am: f8335b6a59 am: 2f8ce5f5cb 
am: 5515b415aa

Change-Id: Ib11c35d24511dab4c733f887677b0d72e044162a
 2016-11-11 00:19:45 +00:00
Narayan Kamath
0c8da8aa05 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
 2016-11-11 00:18:44 +00:00
Narayan Kamath
24b2a54a84 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
 2016-11-11 00:17:48 +00:00
neo.chae
7489336fed Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e am: fb74b8773a 
am: c58ec27e1c

Change-Id: Id44b030b79e924a7d619288b2fc0926d7a536111
 2016-11-11 00:16:46 +00:00
Xin Li
db984f917c 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
 2016-11-11 00:13:50 +00:00
Xin Li
921dd6a5fd 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
 2016-11-11 00:12:50 +00:00
Narayan Kamath
77decadefe Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 
am: 5e92ece8c2

Change-Id: Ia4a0127a904516fc6eeaccf318f3fb9f4de0e7f9
 2016-11-11 00:11:45 +00:00
Narayan Kamath
d98e75feca Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 
am: 22e45fa247

Change-Id: I70befe1803e89e9e2bbcaa70738cf53b16ec7280
 2016-11-11 00:10:31 +00:00
Narayan Kamath
8e6e5a157b Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am: b3b03a9d78 am: ba23956c45 
am: a20eebfab7

Change-Id: I8a6859c90c2ce2f0ba532fd43b214d759889ae25
 2016-11-11 00:09:32 +00:00
Narayan Kamath
21c1e58090 Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485 am: a045aed7a2 am: 846f64c6fc am: 83b46a1590 
am: 330d0ebf48

Change-Id: I0205706d025ea0609c22fec008ea1c954a618f63
 2016-11-11 00:07:12 +00:00
Narayan Kamath
5515b415aa Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f am: f8335b6a59 
am: 2f8ce5f5cb

Change-Id: Icad715644a83a7d37ab49be465d7761f4f22c9af
 2016-11-11 00:06:09 +00:00
Narayan Kamath
ae457e03b7 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
 2016-11-11 00:05:13 +00:00
Narayan Kamath
d17867203b Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e am: d501e032d8 
am: 932cd0ed0e

Change-Id: Iadfa4ef7ca1537df9c9a0d53bb75dce0f64be567
 2016-11-11 00:04:27 +00:00
Narayan Kamath
da65c74c54 Zygote: Additional whitelists for runtime overlay / other static resources. am: 0ad0e859f6 am: 1e6a5d11a6 am: f0cd32619e -s ours am: 4c26a969e9 
am: b7884e5a9f

Change-Id: Ice56c0d81f57757cb9e238cd20c5d968142b8bdd
 2016-11-11 00:04:09 +00:00
Hugo Benichi
afa3694ea9 Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am: fce4e43167 am: 3d9a2d7206 
am: e40917b1ae

Change-Id: I69225098ff2d75aa1a3f5245c0703c06282c7441
 2016-11-11 00:03:26 +00:00
neo.chae
c58ec27e1c Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e 
am: fb74b8773a

Change-Id: I4a2630b7217462897070029a613489c7909aedf6
 2016-11-11 00:02:56 +00:00
Xin Li
ae5db8a6dc 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
 2016-11-11 00:01:56 +00:00
Xin Li
6ec8dd10bb 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
 2016-11-11 00:00:49 +00:00
Narayan Kamath
5e92ece8c2 Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 
am: 9958eb7180

Change-Id: I1fd9dd6f8326ab7077c62fccde6dc508a971db3e
 2016-11-10 23:59:49 +00:00