OSDN Git Service
Jeff Sharkey [Fri, 2 Dec 2016 01:36:30 +0000 (01:36 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b am:
061e7313b4 am:
50102e63da -s ours am:
e94d76436b
am:
40b4b1f774
Change-Id: If2dc11e8db8deb1f432f853aeed013d9d554c8f5
Jeff Sharkey [Fri, 2 Dec 2016 01:25:28 +0000 (01:25 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b am:
061e7313b4 am:
50102e63da -s ours
am:
e94d76436b
Change-Id: Ice97dfb650bafe8fff720db26fcdc6f1db60037e
Jeff Sharkey [Fri, 2 Dec 2016 01:18:32 +0000 (01:18 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
fbf395c220 am:
2d549764be am:
b981c3be70 -s ours am:
a24a33490a
am:
dd32a67b33
Change-Id: I2d8b2894d07f7f6173e979d7eb656e9ac860f06a
Jeff Sharkey [Fri, 2 Dec 2016 01:13:18 +0000 (01:13 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b am:
061e7313b4
am:
50102e63da -s ours
Change-Id: I3a587cb124b30ef5062600e7ba870da58213a094
Jeff Sharkey [Fri, 2 Dec 2016 01:13:09 +0000 (01:13 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
fbf395c220 am:
2d549764be am:
b981c3be70 -s ours
am:
a24a33490a
Change-Id: I8564b110d58f63aeee8afeab87773e97b7301a60
Jeff Sharkey [Fri, 2 Dec 2016 01:07:07 +0000 (01:07 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
fbf395c220 am:
2d549764be
am:
b981c3be70 -s ours
Change-Id: I22fe97ae93c6e665288d46c29429ca7690352fb3
Jeff Sharkey [Fri, 2 Dec 2016 01:06:56 +0000 (01:06 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b
am:
061e7313b4
Change-Id: If0723e8cb1484263a3b96b37d21132d2ebc9b1b5
Jeff Sharkey [Fri, 2 Dec 2016 01:01:49 +0000 (01:01 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
fbf395c220
am:
2d549764be
Change-Id: Iad255e684d36524388a659181da0535bd15e37dc
Jeff Sharkey [Fri, 2 Dec 2016 01:01:49 +0000 (01:01 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3
am:
3e0d93036b
Change-Id: Ice0b80b96cdd7ad1a7691919982d98266a37f8bf
Jeff Sharkey [Fri, 2 Dec 2016 00:56:31 +0000 (00:56 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am:
3b0aa060a3
Change-Id: I3ba9a8dedfda4d878b99cc7de8a41418d424495c
Jeff Sharkey [Fri, 2 Dec 2016 00:56:26 +0000 (00:56 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am:
fbf395c220
Change-Id: I453445723ea9f6124d876dc32c6defab42432351
Jeff Sharkey [Wed, 30 Nov 2016 23:07:00 +0000 (16:07 -0700)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads. However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.
We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health. Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.
Bug:
32172542,
30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit
23ec811266fb728cf159a90ce4882b3c9bac1887)
Jeff Sharkey [Wed, 30 Nov 2016 23:07:00 +0000 (16:07 -0700)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads. However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.
We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health. Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.
Bug:
32172542,
30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit
23ec811266fb728cf159a90ce4882b3c9bac1887)
Rubin Xu [Tue, 22 Nov 2016 15:18:32 +0000 (15:18 +0000)]
Fix boot loop when upgrading direclty from L to N
A second attempt to fix the upgrade problem due to SID == 0
in the above upgrade path. The previous fix contains a bug
where it would cause future attempts to unify work challenge
to silently fail, and crash SystemUi when unlocking.
This fix adds a check for non-zero SID before doing the initial work
profile unification (which caused the upgrade crash when SID == 0).
This means the initial work profile unification would only happen when
the user has unlocked the lockscreen and SID is generated.
Bug:
32490092
Bug:
33050562
Change-Id: Ib28951b2ec26b4f091df7763d9902f55616fcb5c
Zach Jang [Tue, 22 Nov 2016 17:51:57 +0000 (17:51 +0000)]
Merge "Revert "Catch KeyStoreException for setting profile lock"" into nyc-mr1-dev
Zach Jang [Tue, 22 Nov 2016 17:47:18 +0000 (17:47 +0000)]
Revert "Catch KeyStoreException for setting profile lock"
This reverts commit
c8fa5ed8f2d492aa5e005fcdb5991c3f980de045.
Change-Id: Ia1425e649e102cb79280d75e5f49db670214cec3
Scott Main [Fri, 18 Nov 2016 15:30:06 +0000 (15:30 +0000)]
Add cross-links between FINE and COARSE location permissions. bug:
25371600 am:
3fef783359 am:
c8b11fb7cb
am:
192a8c4973
Change-Id: Ib54b2bafcf87a4f27e6a541a4cde0b01c41780b0
Scott Main [Fri, 18 Nov 2016 15:24:18 +0000 (15:24 +0000)]
Add cross-links between FINE and COARSE location permissions. bug:
25371600 am:
3fef783359
am:
c8b11fb7cb
Change-Id: I6db78aa2008d2bdd675a87daeae132e5f5c09371
Scott Main [Fri, 18 Nov 2016 15:17:06 +0000 (15:17 +0000)]
Add cross-links between FINE and COARSE location permissions. bug:
25371600
am:
3fef783359
Change-Id: I7a7e25c37fcd7863f51ea116f624d0bdc2d0c5c6
Ricky Wai [Thu, 17 Nov 2016 18:49:17 +0000 (18:49 +0000)]
Catch KeyStoreException for setting profile lock
When device upgrades from L->N, sid(in gatekeeper) could be 0
even primary profile screenlock is set.
We are now trying to catch the exception so when sid==0 happens,
it will try to tie profile lock again when primary profile is unlocked.
Bug:
32490092
Change-Id: I73011d872ac15e7e09be9bda0165cf7f6a75493a
Scott Main [Tue, 15 Nov 2016 23:22:32 +0000 (15:22 -0800)]
Add cross-links between FINE and COARSE location permissions.
bug:
25371600
Change-Id: I7af21b063533085ce20c51d18f118c7752fd77f0
(cherry picked from commit
b18745616f9dd6b79202168b648edcef382ea967)
Selim Cinek [Thu, 3 Nov 2016 21:55:40 +0000 (14:55 -0700)]
Fixed a bug with the emergency affordance in multi user
The emergency call was not launched in the current user
and therefore was only launching once the user had switched.
Change-Id: If6f3bcf77d88a0658b6e0f91f7e4da5d6264b04f
Fixes:
32424103
Test: manual: switch to secondary user and launch emergency affordance
Andriy Naborskyy [Mon, 14 Nov 2016 13:42:21 +0000 (13:42 +0000)]
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
Andriy Naborskyy [Mon, 14 Nov 2016 13:41:20 +0000 (13:41 +0000)]
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
Brian Carlstrom [Mon, 14 Nov 2016 13:40:16 +0000 (13:40 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am:
5d0cabf78e am:
3be5dec18a am:
b272d7cb13 am:
f9150bf362
am:
58612638d1
Change-Id: If03a724c633b1ba97bfd7797f61d0f706654f923
Narayan Kamath [Mon, 14 Nov 2016 13:39:05 +0000 (13:39 +0000)]
Zygote : Block SIGCHLD during fork. am:
b6f3751599 am:
b23e864573 am:
52021073a4 am:
479385b6b3
am:
5f70cb0898
Change-Id: I16da70d1722e16ca61e31fff092ca778a5d66339
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
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
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
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
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
Andriy Naborskyy [Mon, 14 Nov 2016 13:26:16 +0000 (13:26 +0000)]
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
Andriy Naborskyy [Mon, 14 Nov 2016 13:25:11 +0000 (13:25 +0000)]
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
Change-Id: I83f374c3a369b616009bc1381a317c21952698c8
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
Brian Carlstrom [Mon, 14 Nov 2016 13:24:01 +0000 (13:24 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am:
5d0cabf78e am:
3be5dec18a am:
b272d7cb13
am:
f9150bf362
Change-Id: I647f570452982cdf7202dccad793032305e61a9a
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
Narayan Kamath [Mon, 14 Nov 2016 13:22:52 +0000 (13:22 +0000)]
Zygote : Block SIGCHLD during fork. am:
b6f3751599 am:
b23e864573 am:
52021073a4
am:
479385b6b3
Change-Id: Ia0c1b9e495a4bf78b3b12821a7a106a940c12e87
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Andriy Naborskyy [Mon, 14 Nov 2016 13:09:40 +0000 (13:09 +0000)]
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
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
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
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
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
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
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
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
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
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
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
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
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:22 +0000 (03:28 +0000)]
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
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
Andriy Naborskyy [Sat, 12 Nov 2016 03:18:51 +0000 (03:18 +0000)]
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev
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
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
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
OSDN Git Service
