OSDN Git Service
Vladislav Kaznacheev [Fri, 9 Sep 2016 18:42:42 +0000 (18:42 +0000)]
Merge "Update JavaDoc for DragEvent.getLocalState" into nyc-dev
am:
148ccbb082
Change-Id: I0933f7f9f2180462b173fc2ca0ef23bfe464b1b5
Vladislav Kaznacheev [Fri, 9 Sep 2016 18:42:34 +0000 (18:42 +0000)]
Update JavaDoc for DragEvent.getLocalState
am:
048f3bfaf0
Change-Id: I72bec54ac999ebce5779062ddc5effd1bb4d61ce
TreeHugger Robot [Fri, 9 Sep 2016 18:34:55 +0000 (18:34 +0000)]
Merge "Update JavaDoc for DragEvent.getLocalState" into nyc-dev
Narayan Kamath [Fri, 9 Sep 2016 10:52:43 +0000 (10:52 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am:
00e808b06b am:
e59073096e am:
24ffc9ab47 am:
bd6a29cddc am:
e9295560cf
am:
19ebec6d36
Change-Id: Idf28988f014023f04bda3d3ce77a37fc26863469
Narayan Kamath [Fri, 9 Sep 2016 10:44:54 +0000 (10:44 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am:
00e808b06b am:
e59073096e am:
24ffc9ab47 am:
bd6a29cddc
am:
e9295560cf
Change-Id: Ib64b8f7e777a5779ef7b057cb55bf1b8148e2fa5
Narayan Kamath [Fri, 9 Sep 2016 10:44:45 +0000 (10:44 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
82c6e6267e -s ours am:
646ee94421 am:
8f0cc3dd13 am:
8cb6b9335c am:
eb972e5d9d
am:
7aba7234e1
Change-Id: I8c33caec1a869caa4ea3d1b7e2cfcb3a9a6787ea
Narayan Kamath [Fri, 9 Sep 2016 10:39:40 +0000 (10:39 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
82c6e6267e -s ours am:
646ee94421 am:
8f0cc3dd13 am:
8cb6b9335c
am:
eb972e5d9d
Change-Id: I8030e2b745fe08b238fd9da5b518729fda05174e
Narayan Kamath [Fri, 9 Sep 2016 10:39:29 +0000 (10:39 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am:
00e808b06b am:
e59073096e am:
24ffc9ab47
am:
bd6a29cddc
Change-Id: I78f74e5d3f0e0b82afe4d5f48f2541a881189aa1
Narayan Kamath [Fri, 9 Sep 2016 10:33:43 +0000 (10:33 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
82c6e6267e -s ours am:
646ee94421 am:
8f0cc3dd13
am:
8cb6b9335c
Change-Id: If2f8fbef801cd61834ac50a7e1a254ed21b95cc2
Narayan Kamath [Fri, 9 Sep 2016 10:33:40 +0000 (10:33 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am:
00e808b06b am:
e59073096e
am:
24ffc9ab47
Change-Id: I78adbdbbf8ffddfee3cd8b1407415cdf3a4d1b1f
Narayan Kamath [Fri, 9 Sep 2016 10:28:52 +0000 (10:28 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev am:
00e808b06b
am:
e59073096e
Change-Id: Ifb7972c30d70a0fbc4ffdae100aac2d77ca445ca
Narayan Kamath [Fri, 9 Sep 2016 10:28:46 +0000 (10:28 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
82c6e6267e -s ours am:
646ee94421
am:
8f0cc3dd13
Change-Id: Ida08d48da51f9f49dc70a916fa379cf89a4d33c0
Narayan Kamath [Fri, 9 Sep 2016 10:21:48 +0000 (10:21 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
82c6e6267e -s ours
am:
646ee94421
Change-Id: I62f6556e630707274daa4ee0a4a57c77f5329bbc
Narayan Kamath [Fri, 9 Sep 2016 10:18:19 +0000 (10:18 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev
am:
00e808b06b
Change-Id: I14939b5bf04ba47229e663b2ffc50543c5c6bc9a
Narayan Kamath [Fri, 9 Sep 2016 10:15:11 +0000 (10:15 +0000)]
Backport changes to whitelist sockets opened by the zygote.
am:
82c6e6267e -s ours
Change-Id: Ib35b2567f19aff39d285794951cf9b8cb8d74ef1
Narayan Kamath [Fri, 9 Sep 2016 10:05:44 +0000 (10:05 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into lmp-mr1-ub-dev
Cheryl Potter [Fri, 9 Sep 2016 01:24:04 +0000 (01:24 +0000)]
Merge "docs: Define card data for GPU Debugger b/
31318053" into nyc-dev
am:
8a7947b0d6
Change-Id: I98277a55a0699b995bd71b93bcc68e914b14a576
Cheryl Potter [Fri, 9 Sep 2016 01:23:57 +0000 (01:23 +0000)]
docs: Define card data for GPU Debugger b/
31318053
am:
9af802df0f
Change-Id: Iccbf477340c50283660c0eed32decd4587e56154
Cheryl Potter [Fri, 9 Sep 2016 01:15:52 +0000 (01:15 +0000)]
Merge "docs: Define card data for GPU Debugger b/
31318053" into nyc-dev
Vladislav Kaznacheev [Thu, 8 Sep 2016 23:37:23 +0000 (16:37 -0700)]
Update JavaDoc for DragEvent.getLocalState
Explicitly state that "local state" is local to the window
which has started the drag operation.
Bug:
31372686
Change-Id: Idbea7586c4e74097362067fa90390b97744181bb
Andrew Solovay [Thu, 8 Sep 2016 17:43:45 +0000 (17:43 +0000)]
Merge "docs: Fixing links to moved Fragments guide, + redirect" into nyc-dev
am:
de40f9d677
Change-Id: Ib6be573fb963eda1d032c55eb9da4878d7374533
Andrew Solovay [Thu, 8 Sep 2016 17:43:40 +0000 (17:43 +0000)]
docs: Fixing links to moved Fragments guide, + redirect
am:
f53968061c
Change-Id: Ic29b29244d2919bcd5eb5b72daeaa8a78dc71e2d
Andrew Solovay [Thu, 8 Sep 2016 17:36:46 +0000 (17:36 +0000)]
Merge "docs: Fixing links to moved Fragments guide, + redirect" into nyc-dev
Narayan Kamath [Thu, 8 Sep 2016 09:16:24 +0000 (09:16 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am:
014016cf32 am:
447d3798f1 am:
71e6a6f12a am:
177ee386b9
am:
b126d7c7c5
Change-Id: Ibd4f7188bf500886e53d4b714e5c7de1ad5b10c0
Narayan Kamath [Thu, 8 Sep 2016 09:05:08 +0000 (09:05 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am:
014016cf32 am:
447d3798f1 am:
71e6a6f12a
am:
177ee386b9
Change-Id: Ic7a1d8c1ba996024b02915e431f2b7aacc306225
Narayan Kamath [Thu, 8 Sep 2016 08:57:48 +0000 (08:57 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
0f6a0e1560 -s ours am:
6fa8339792 am:
c6ced086d1 am:
4474da7b7c
am:
5556367bc1
Change-Id: I5db1d9538c274cf6d5e9a001ba7d38056f3928eb
Narayan Kamath [Thu, 8 Sep 2016 08:57:46 +0000 (08:57 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am:
459810b9b7 am:
47b88a15f6 am:
7a0c7ab520
am:
45d7b8dd2a
Change-Id: I66a02ec7bac220d515fc623dbcd0688b72db37fb
Narayan Kamath [Thu, 8 Sep 2016 08:49:59 +0000 (08:49 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
41ca1bce01 am:
49d992fdb0 am:
67c4adb5c1 -s ours
am:
bf16d345a6
Change-Id: Iedb9a7c7428cd8a5dc5aabaf9f1f88d96c8f022a
Narayan Kamath [Thu, 8 Sep 2016 08:48:39 +0000 (08:48 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
0f6a0e1560 -s ours am:
6fa8339792 am:
c6ced086d1
am:
4474da7b7c
Change-Id: Ie14b0e7887bd2da5c986b077f4563bbc306c88be
Narayan Kamath [Thu, 8 Sep 2016 08:48:31 +0000 (08:48 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am:
459810b9b7 am:
47b88a15f6
am:
7a0c7ab520
Change-Id: I0ed385ab13ca461c1b77226d3be3cf788a09d3d6
Narayan Kamath [Thu, 8 Sep 2016 08:45:47 +0000 (08:45 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am:
014016cf32 am:
447d3798f1
am:
71e6a6f12a
Change-Id: Ib162897a1428ab8c025a414eb0a3872327274f7a
Narayan Kamath [Thu, 8 Sep 2016 08:44:31 +0000 (08:44 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
41ca1bce01 am:
49d992fdb0
am:
67c4adb5c1 -s ours
Change-Id: I2af50f6d32be035f491df4a0b83489ba7da186e7
Narayan Kamath [Thu, 8 Sep 2016 08:40:03 +0000 (08:40 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev am:
014016cf32
am:
447d3798f1
Change-Id: I323c669ed44e10f9e3a91271f47800754da5d389
Narayan Kamath [Thu, 8 Sep 2016 08:39:07 +0000 (08:39 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
0f6a0e1560 -s ours am:
6fa8339792
am:
c6ced086d1
Change-Id: Ie3699efd33fe53acfd0dff64cbb18e4792a65bf3
Narayan Kamath [Thu, 8 Sep 2016 08:35:04 +0000 (08:35 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev am:
459810b9b7
am:
47b88a15f6
Change-Id: Id267e22508824d569f54068291304584b3343b9a
Narayan Kamath [Thu, 8 Sep 2016 08:34:58 +0000 (08:34 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
41ca1bce01
am:
49d992fdb0
Change-Id: I0560d831235bd7ba3ea764b23e64b4e08110d7e5
Narayan Kamath [Thu, 8 Sep 2016 08:33:40 +0000 (08:33 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
0f6a0e1560 -s ours
am:
6fa8339792
Change-Id: Id7ad55a251a26782815005218dc186b53e74cfca
Narayan Kamath [Thu, 8 Sep 2016 08:30:41 +0000 (08:30 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev
am:
014016cf32
Change-Id: Ic0cf8b5cc2accaad552b82eaadce359e21e5e624
Narayan Kamath [Thu, 8 Sep 2016 08:24:54 +0000 (08:24 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev
am:
459810b9b7
Change-Id: I867a7c97c8363ede1b04e4ea8a75045d36d9d58d
Narayan Kamath [Thu, 8 Sep 2016 08:24:47 +0000 (08:24 +0000)]
Backport changes to whitelist sockets opened by the zygote.
am:
41ca1bce01
Change-Id: Id08676457fa3fa022d607e5de754f49b9c396261
Narayan Kamath [Thu, 8 Sep 2016 08:23:49 +0000 (08:23 +0000)]
Backport changes to whitelist sockets opened by the zygote.
am:
0f6a0e1560 -s ours
Change-Id: I2cdd131b750b4d04672149dcf7a90d2d566dd621
Narayan Kamath [Thu, 8 Sep 2016 08:20:55 +0000 (08:20 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dr-dev
Narayan Kamath [Thu, 8 Sep 2016 08:12:17 +0000 (08:12 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into mnc-dev
Narayan Kamath [Thu, 8 Sep 2016 07:47:24 +0000 (07:47 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev
am:
15ab539368
Change-Id: I88c0fde563218de25fb0fa9a6bd29abf0df44212
Narayan Kamath [Thu, 8 Sep 2016 07:41:44 +0000 (07:41 +0000)]
Backport changes to whitelist sockets opened by the zygote.
am:
a1252ccbdb
Change-Id: Idd41ba2068102de067a66080da0563cf75b1e433
Narayan Kamath [Thu, 8 Sep 2016 07:30:43 +0000 (07:30 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev
Andrew Solovay [Thu, 8 Sep 2016 00:04:52 +0000 (00:04 +0000)]
Merge "docs: Added item to Support Library revision history" into nyc-dev
am:
bdbed7857b
Change-Id: I9f7fe6847bb36d197174869ba6224d3db1581c0e
Andrew Solovay [Thu, 8 Sep 2016 00:04:48 +0000 (00:04 +0000)]
docs: Added item to Support Library revision history
am:
89e77eb55c
Change-Id: Ia649f9e8f28697014153a2f29762426303292aa2
Scott Main [Wed, 7 Sep 2016 23:51:47 +0000 (23:51 +0000)]
Merge "revisions to the Building Your First app class with feedback from mpawlan (thank you!)" into nyc-dev
am:
9635756473
Change-Id: Ieae6cd0439d75e8858a16b44393fd248ddffcaa3
smain@google.com [Wed, 7 Sep 2016 23:51:44 +0000 (23:51 +0000)]
revisions to the Building Your First app class with feedback from mpawlan (thank you!)
am:
14f51a724e
Change-Id: I1a0d719e4aac12155cf0889069b8efd10084fe67
TreeHugger Robot [Wed, 7 Sep 2016 23:45:37 +0000 (23:45 +0000)]
Merge "docs: Added item to Support Library revision history" into nyc-dev
Scott Main [Wed, 7 Sep 2016 23:39:50 +0000 (23:39 +0000)]
Merge "revisions to the Building Your First app class with feedback from mpawlan (thank you!)" into nyc-dev
Mark Lu [Wed, 7 Sep 2016 23:29:27 +0000 (23:29 +0000)]
Merge "docs: fix grammar mistake in TextureView" into nyc-dev
am:
2b05f12911
Change-Id: Ia4944106365d6c6c85b3cf2dc47250b160a5424b
Mark Lu [Wed, 7 Sep 2016 23:29:20 +0000 (23:29 +0000)]
docs: fix grammar mistake in TextureView
am:
e8691d19cb
Change-Id: I857deef5cf08c9cdaf0d6e8e99449e688bec5ba5
Mark Lu [Wed, 7 Sep 2016 23:24:09 +0000 (23:24 +0000)]
Merge "docs: fix grammar mistake in TextureView" into nyc-dev
Andrew Solovay [Fri, 26 Aug 2016 22:46:38 +0000 (15:46 -0700)]
docs: Fixing links to moved Fragments guide, + redirect
The Fragments API guide was moved, but apparently a redirect was
never set up. Also, there are a few links to the old location in
the Javadocs.
Staged the revised Javadocs (see first comment for stage location).
Not going to stage the redirects file since it would trash another,
bigger CL that deals with the redirects file, but it's pretty
straightforward.
bug:
30559011
Change-Id: Ibd65f85c1ebb9789c1d40614fe11fe4ffda97e58
Robin Lee [Wed, 7 Sep 2016 22:15:30 +0000 (22:15 +0000)]
Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev
am:
fb2cdce7c2
Change-Id: I50be838e9f0f9e794389f6d24a5e699d7f163caf
Robin Lee [Wed, 7 Sep 2016 22:15:28 +0000 (22:15 +0000)]
DO NOT MERGE Stop work challenge freeform bypass
am:
0737c2b4c2
Change-Id: Ia76391f710e42e9634010bd211a0370230b318e3
TreeHugger Robot [Wed, 7 Sep 2016 22:07:19 +0000 (22:07 +0000)]
Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev
Andrew Solovay [Mon, 29 Aug 2016 19:05:17 +0000 (12:05 -0700)]
docs: Added item to Support Library revision history
See first comment for doc stage location.
bug:
30622244
Change-Id: I7cfdf2107d57d72565bcc4cc503242741f2452ff
smain@google.com [Tue, 6 Sep 2016 19:32:18 +0000 (12:32 -0700)]
revisions to the Building Your First app class with feedback from mpawlan (thank you!)
stage: https://android-dot-devsite.googleplex.com/training/basics/firstapp/creating-project.html
Change-Id: I40ce201553226fa36477e54b82721bc6cc85b88b
Alan Viverette [Wed, 7 Sep 2016 20:59:53 +0000 (20:59 +0000)]
Merge "Support library 24.2.0 API diff" into nyc-dev
am:
9d25bf73a4
Change-Id: I0f691281d86562c96ed0768efb69d6df77d29456
Alan Viverette [Wed, 7 Sep 2016 20:59:49 +0000 (20:59 +0000)]
Support library 24.2.0 API diff
am:
ae3fecc1a9
Change-Id: Ie9a007ad44ae0293ef4c4138888da0e78d61b322
Alan Viverette [Wed, 7 Sep 2016 20:54:04 +0000 (20:54 +0000)]
Merge "Support library 24.2.0 API diff" into nyc-dev
Narayan Kamath [Wed, 7 Sep 2016 20:36:47 +0000 (20:36 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours am:
9802fcfa2b am:
2acf9f7e3c am:
36b90a1934 am:
5febcdd210 am:
ebcc7aeda9
am:
f52b30cf8d
Change-Id: I99751b55fb10e0fcd2703d59d8925744a73bcfd0
Narayan Kamath [Wed, 7 Sep 2016 20:32:17 +0000 (20:32 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours am:
9802fcfa2b am:
2acf9f7e3c am:
36b90a1934 am:
5febcdd210
am:
ebcc7aeda9
Change-Id: Ie2e2292bbb8c6d274109d64f7dd3ed00fca0ba0f
Andrew Solovay [Wed, 7 Sep 2016 20:25:45 +0000 (20:25 +0000)]
Merge "docs: Fixing redirect file" into nyc-dev
am:
33831c02b5
Change-Id: I22a2c26b77c0ce27499ee1a9ba3567e6c337cf02
Andrew Solovay [Wed, 7 Sep 2016 20:25:43 +0000 (20:25 +0000)]
docs: Fixing redirect file
am:
5bf2ea6670
Change-Id: I8d1ea69862b543eb13c96398d967979e2040914a
Narayan Kamath [Wed, 7 Sep 2016 20:23:28 +0000 (20:23 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours am:
9802fcfa2b am:
2acf9f7e3c am:
36b90a1934
am:
5febcdd210
Change-Id: Ib7e40acc4682e4198dcaab78c57de02acfe89c94
Narayan Kamath [Fri, 19 Aug 2016 12:45:24 +0000 (13:45 +0100)]
Backport changes to whitelist sockets opened by the zygote.
This is the backport of the following commits :
Commit
c5f27a7cb2ec816f483a65255034a1b57a8aa22:
-----------------------------------------------
Reopen whitelisted zygote file descriptors after a fork.
We don't want these descriptors to be shared post-fork, so we'll
have to close and reopen them when the zygote forks. The set of
open descriptors is checked against a whitelist and it is a fatal
error if a non whitelisted FD is opened. It is also a fatal error
if anything other than a regular file / character device or socket
is opened at the time of forking.
This work is done in two stages :
- An initial list of FDs is constructed and cached prior to the
first zygote fork.
- On each subsequent fork, we check whether the list of open FDs
has changed. We are currently tolerant of changes, but in the
longer term, it should be a fatal error if the set of open file
descriptors in the zygote changes.
- Post fork, we traverse the list of open descriptors and reopen
them if necessary.
bug:
30963384
Commit
3764a260f0c90dcb323caeda14baf903cc108759:
-----------------------------------------------
Add a whitelist of sockets on fork.
Maintain a whitelist of AF_UNIX sockets that are permitted
to exist at the time of forking. If an open socket does not belong
to the whitelist (or is not AF_UNIX), the process will abort. If an
open socket is whitelisted, it will be redirected to /dev/null after
a sucessful fork. This allows us to unify our handling of the special
zygote sockets (/dev/socket/zygote[_secondary]) with the existing
whitelist of non socket file descriptors.
This change also removes non-fatal ALOGW messages since they have the
side effect of reopening the logging socket.
bug:
30963384
Commit
0b76d6a28e6978151bf245a775329cdae5e574d5:
-----------------------------------------------
fd_utils: Fix broken usage of iterators.
There were two separate issues here :
- RestatInternal was using an iterator after a call to erase(). This
will not work because it will be invalidated.
- The "standard" for loop idiom for iterating over a map while making
structural changes to it is broken. Switch to a while loop and treat
cases where elements are erased differently from cases where they
aren't.
bug:
31092930
bug:
30963384
Plus additional changes:
-----------------------------------------------
- change std::unordered_map to std::tr1::unordered_map.
- add /dev/alarm and /dev/__properties__ to the whitelist.
- map.erase(iterator) returns void prior to C++11, so need the kludge
of calling erase(it++).
(cherry picked from commit
7ec85f9d549971af59f047d5eafd7a829e1541c7)
Change-Id: If44dc64275d753553233b78a05d41df9d5bfdc36
TreeHugger Robot [Wed, 7 Sep 2016 20:19:07 +0000 (20:19 +0000)]
Merge "docs: Fixing redirect file" into nyc-dev
Narayan Kamath [Wed, 7 Sep 2016 20:17:02 +0000 (20:17 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours am:
9802fcfa2b am:
2acf9f7e3c
am:
36b90a1934
Change-Id: Iec55904ecb004d3bf89bf3a065e5811afae798d6
Narayan Kamath [Wed, 7 Sep 2016 20:12:43 +0000 (20:12 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours am:
9802fcfa2b
am:
2acf9f7e3c
Change-Id: Ideae7875e299ec0292054aad85fe8aa92b6aba9b
Narayan Kamath [Wed, 7 Sep 2016 20:07:58 +0000 (20:07 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87 am:
9a409265fc -s ours
am:
9802fcfa2b
Change-Id: Iabeefa7d07d78002c124ce62dc210111b83a99b7
Narayan Kamath [Wed, 7 Sep 2016 20:01:56 +0000 (20:01 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54 am:
f7b9f84f87
am:
9a409265fc -s ours
Change-Id: Idf4dcc5ab7e8b0510848cbd2f220fe7a8e4b3e04
Narayan Kamath [Fri, 19 Aug 2016 12:45:24 +0000 (13:45 +0100)]
Backport changes to whitelist sockets opened by the zygote.
This is the backport of the following commits :
Reopen whitelisted zygote file descriptors after a fork.
We don't want these descriptors to be shared post-fork, so we'll
have to close and reopen them when the zygote forks. The set of
open descriptors is checked against a whitelist and it is a fatal
error if a non whitelisted FD is opened. It is also a fatal error
if anything other than a regular file / character device or socket
is opened at the time of forking.
This work is done in two stages :
- An initial list of FDs is constructed and cached prior to the
first zygote fork.
- On each subsequent fork, we check whether the list of open FDs
has changed. We are currently tolerant of changes, but in the
longer term, it should be a fatal error if the set of open file
descriptors in the zygote changes.
- Post fork, we traverse the list of open descriptors and reopen
them if necessary.
bug:
30963384
(cherry picked from commit
c5f27a7cb2ec816f483a65255034a1b57a8aa221)
Fix clang build breakage (-Werror -Wformat).
Use %zd for size_t. Note that this will break only on (-plus-)aosp because
clang is disabled on the N development branches.
bug:
30963384
(cherry picked from commit
b334c33d65894f5ca9833fa55c3a1cf75e01c497)
Add a whitelist of sockets on fork.
Maintain a whitelist of AF_UNIX sockets that are permitted
to exist at the time of forking. If an open socket does not belong
to the whitelist (or is not AF_UNIX), the process will abort. If an
open socket is whitelisted, it will be redirected to /dev/null after
a sucessful fork. This allows us to unify our handling of the special
zygote sockets (/dev/socket/zygote[_secondary]) with the existing
whitelist of non socket file descriptors.
This change also removes non-fatal ALOGW messages since they have the
side effect of reopening the logging socket.
bug:
30963384
(cherry picked from commit
3764a260f0c90dcb323caeda14baf903cc108759)
fd_utils: Remove whitelist for "/dev/pmsg0".
We're now calling __android_log_close prior to a fork, so this file
shouldn't need to be open.
bug:
31243313
bug:
30963384
(cherry picked from commit
8dee0541904e4f792cdebdee4f23f768561cb276)
fd_utils: Fix broken usage of iterators.
There were two separate issues here :
- RestatInternal was using an iterator after a call to erase(). This
will not work because it will be invalidated.
- The "standard" for loop idiom for iterating over a map while making
structural changes to it is broken. Switch to a while loop and treat
cases where elements are erased differently from cases where they
aren't.
bug:
31092930
bug:
30963384
(cherry picked from commit
0b76d6a28e6978151bf245a775329cdae5e574d5)
add dri device to zygote whitelisted FDs
The driver can be used just like /dev/ion for graphic buffers.
(cherry picked from commit
8977e424ee2d6d85fec419532ae510131aa88c45)
Andrew Solovay [Wed, 7 Sep 2016 19:07:52 +0000 (19:07 +0000)]
Merge "docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI" into nyc-dev
am:
4dc743ac67
Change-Id: Id0057e57b226cddb1411aa9c864143d704565013
Andrew Solovay [Wed, 7 Sep 2016 19:07:47 +0000 (19:07 +0000)]
docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI
am:
7cfe9f83ac
Change-Id: Ia16702066a3760311eac69e4b2a8923380e77fde
TreeHugger Robot [Wed, 7 Sep 2016 19:02:35 +0000 (19:02 +0000)]
Merge "docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI" into nyc-dev
Narayan Kamath [Wed, 7 Sep 2016 18:58:41 +0000 (18:58 +0000)]
Backport changes to whitelist sockets opened by the zygote. am:
7ec85f9d54
am:
f7b9f84f87
Change-Id: I317cecff389f30c5d47e4adee1afafbde8d9d23d
Narayan Kamath [Wed, 7 Sep 2016 18:53:40 +0000 (18:53 +0000)]
Backport changes to whitelist sockets opened by the zygote.
am:
7ec85f9d54
Change-Id: I6db56b5b06636201382f6d908297644183253c0b
Andrew Solovay [Fri, 26 Aug 2016 21:31:25 +0000 (14:31 -0700)]
docs: Fixing redirect file
Devsite handles "redirect this directory tree" differently than DAC
did; as a result, a bunch of redirects were broken. (On Devsite, a
redirect ending in a slash redirects *only* paths that match it;
to redirect that directory and all its contents, end with /...)
Also deleted one redirect that wouldn't work (trying to redirect
foo.html#bar , which wouldn't work--the anchors are ignored on
devsite and there was a separate redirect for just foo.html).
When a redirect pointed *to* a path ending in slash -- but was clearly
meant to point to the directory itself (i.e. the /index.html file) --
I removed the trailing slash.
Redirects staged to https://android-dot-devsite.googleplex.com , so
they should all work there.
bug:
30748799
Change-Id: I6d090de5e6efa6ddb2bbe3e99fdbfb0ae02b88d5
Narayan Kamath [Fri, 19 Aug 2016 12:45:24 +0000 (13:45 +0100)]
Backport changes to whitelist sockets opened by the zygote.
This is the backport of the following commits :
Commit
c5f27a7cb2ec816f483a65255034a1b57a8aa22:
-----------------------------------------------
Reopen whitelisted zygote file descriptors after a fork.
We don't want these descriptors to be shared post-fork, so we'll
have to close and reopen them when the zygote forks. The set of
open descriptors is checked against a whitelist and it is a fatal
error if a non whitelisted FD is opened. It is also a fatal error
if anything other than a regular file / character device or socket
is opened at the time of forking.
This work is done in two stages :
- An initial list of FDs is constructed and cached prior to the
first zygote fork.
- On each subsequent fork, we check whether the list of open FDs
has changed. We are currently tolerant of changes, but in the
longer term, it should be a fatal error if the set of open file
descriptors in the zygote changes.
- Post fork, we traverse the list of open descriptors and reopen
them if necessary.
bug:
30963384
Commit
3764a260f0c90dcb323caeda14baf903cc108759:
-----------------------------------------------
Add a whitelist of sockets on fork.
Maintain a whitelist of AF_UNIX sockets that are permitted
to exist at the time of forking. If an open socket does not belong
to the whitelist (or is not AF_UNIX), the process will abort. If an
open socket is whitelisted, it will be redirected to /dev/null after
a sucessful fork. This allows us to unify our handling of the special
zygote sockets (/dev/socket/zygote[_secondary]) with the existing
whitelist of non socket file descriptors.
This change also removes non-fatal ALOGW messages since they have the
side effect of reopening the logging socket.
bug:
30963384
Commit
0b76d6a28e6978151bf245a775329cdae5e574d5:
-----------------------------------------------
fd_utils: Fix broken usage of iterators.
There were two separate issues here :
- RestatInternal was using an iterator after a call to erase(). This
will not work because it will be invalidated.
- The "standard" for loop idiom for iterating over a map while making
structural changes to it is broken. Switch to a while loop and treat
cases where elements are erased differently from cases where they
aren't.
bug:
31092930
bug:
30963384
Plus additional changes:
-----------------------------------------------
- add /dev/__properties__ to the whitelist.
Change-Id: I709a7f4913e807a8fec8a58c81e98fe5b5222820
Narayan Kamath [Fri, 19 Aug 2016 12:45:24 +0000 (13:45 +0100)]
Backport changes to whitelist sockets opened by the zygote.
This is the backport of the following commits :
Commit
c5f27a7cb2ec816f483a65255034a1b57a8aa22:
-----------------------------------------------
Reopen whitelisted zygote file descriptors after a fork.
We don't want these descriptors to be shared post-fork, so we'll
have to close and reopen them when the zygote forks. The set of
open descriptors is checked against a whitelist and it is a fatal
error if a non whitelisted FD is opened. It is also a fatal error
if anything other than a regular file / character device or socket
is opened at the time of forking.
This work is done in two stages :
- An initial list of FDs is constructed and cached prior to the
first zygote fork.
- On each subsequent fork, we check whether the list of open FDs
has changed. We are currently tolerant of changes, but in the
longer term, it should be a fatal error if the set of open file
descriptors in the zygote changes.
- Post fork, we traverse the list of open descriptors and reopen
them if necessary.
bug:
30963384
Commit
3764a260f0c90dcb323caeda14baf903cc108759:
-----------------------------------------------
Add a whitelist of sockets on fork.
Maintain a whitelist of AF_UNIX sockets that are permitted
to exist at the time of forking. If an open socket does not belong
to the whitelist (or is not AF_UNIX), the process will abort. If an
open socket is whitelisted, it will be redirected to /dev/null after
a sucessful fork. This allows us to unify our handling of the special
zygote sockets (/dev/socket/zygote[_secondary]) with the existing
whitelist of non socket file descriptors.
This change also removes non-fatal ALOGW messages since they have the
side effect of reopening the logging socket.
bug:
30963384
Commit
0b76d6a28e6978151bf245a775329cdae5e574d5:
-----------------------------------------------
fd_utils: Fix broken usage of iterators.
There were two separate issues here :
- RestatInternal was using an iterator after a call to erase(). This
will not work because it will be invalidated.
- The "standard" for loop idiom for iterating over a map while making
structural changes to it is broken. Switch to a while loop and treat
cases where elements are erased differently from cases where they
aren't.
bug:
31092930
bug:
30963384
Plus additional changes:
-----------------------------------------------
- add /dev/__properties__ to the whitelist.
Change-Id: Ic512be6362c3c5d84767e933884872b7e995dfea
Narayan Kamath [Fri, 19 Aug 2016 12:45:24 +0000 (13:45 +0100)]
Backport changes to whitelist sockets opened by the zygote.
This is the backport of the following commits :
Commit
c5f27a7cb2ec816f483a65255034a1b57a8aa22:
-----------------------------------------------
Reopen whitelisted zygote file descriptors after a fork.
We don't want these descriptors to be shared post-fork, so we'll
have to close and reopen them when the zygote forks. The set of
open descriptors is checked against a whitelist and it is a fatal
error if a non whitelisted FD is opened. It is also a fatal error
if anything other than a regular file / character device or socket
is opened at the time of forking.
This work is done in two stages :
- An initial list of FDs is constructed and cached prior to the
first zygote fork.
- On each subsequent fork, we check whether the list of open FDs
has changed. We are currently tolerant of changes, but in the
longer term, it should be a fatal error if the set of open file
descriptors in the zygote changes.
- Post fork, we traverse the list of open descriptors and reopen
them if necessary.
bug:
30963384
Commit
3764a260f0c90dcb323caeda14baf903cc108759:
-----------------------------------------------
Add a whitelist of sockets on fork.
Maintain a whitelist of AF_UNIX sockets that are permitted
to exist at the time of forking. If an open socket does not belong
to the whitelist (or is not AF_UNIX), the process will abort. If an
open socket is whitelisted, it will be redirected to /dev/null after
a sucessful fork. This allows us to unify our handling of the special
zygote sockets (/dev/socket/zygote[_secondary]) with the existing
whitelist of non socket file descriptors.
This change also removes non-fatal ALOGW messages since they have the
side effect of reopening the logging socket.
bug:
30963384
Commit
0b76d6a28e6978151bf245a775329cdae5e574d5:
-----------------------------------------------
fd_utils: Fix broken usage of iterators.
There were two separate issues here :
- RestatInternal was using an iterator after a call to erase(). This
will not work because it will be invalidated.
- The "standard" for loop idiom for iterating over a map while making
structural changes to it is broken. Switch to a while loop and treat
cases where elements are erased differently from cases where they
aren't.
bug:
31092930
bug:
30963384
Plus additional changes:
-----------------------------------------------
- change std::unordered_map to std::tr1::unordered_map.
- add /dev/alarm and /dev/__properties__ to the whitelist.
- map.erase(iterator) returns void prior to C++11, so need the kludge
of calling erase(it++).
Change-Id: I694ff66d5f227239b0190ffc2287882b16e336fa
Sreevani Sreejith [Tue, 6 Sep 2016 21:32:22 +0000 (21:32 +0000)]
Merge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:
30951238" into nyc-dev
am:
d2273e433c
Change-Id: I76ced02277404117c008fcea76ffafbd8ec39e82
sreevanis [Tue, 6 Sep 2016 21:32:17 +0000 (21:32 +0000)]
docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:
30951238
am:
1e4bc15f31
Change-Id: I72bb425f9d40e73a9562312f990555673553bcc4
Sreevani Sreejith [Tue, 6 Sep 2016 21:24:31 +0000 (21:24 +0000)]
Merge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:
30951238" into nyc-dev
Cheryl Potter [Tue, 6 Sep 2016 21:13:52 +0000 (14:13 -0700)]
docs: Define card data for GPU Debugger
b/
31318053
Change-Id: Iaedeaa8f39d1adb7dd556d26f6cf176a0a6b4003
Amanda Kassay [Tue, 6 Sep 2016 19:11:56 +0000 (19:11 +0000)]
Update #jd-content to #body-content for DevSite layout changes.
am:
b5887e68c3
Change-Id: I105828c530bb57aa367d8ae937a194cd1181ff0e
sreevanis [Tue, 30 Aug 2016 17:02:43 +0000 (10:02 -0700)]
docs: Added functional and UI quality criteria for Wear 2.0 apps.
Bug:
30951238
Change-Id: I5cbfac60716415d87f049ae2313fed7bfa214e28
Amanda Kassay [Tue, 6 Sep 2016 16:57:36 +0000 (12:57 -0400)]
Update #jd-content to #body-content for DevSite layout changes.
Change-Id: I57c43a9b05a2bd072c54bf53e8428015edf0a90e
Dirk Dougherty [Tue, 6 Sep 2016 14:22:30 +0000 (14:22 +0000)]
Doc change: remove useUpdatedTemplates script and sections using old templates.
am:
9ac575abc3
Change-Id: I7a9d976f300b516bc7f38dacb0c89be95f1b3ef4
Dirk Dougherty [Fri, 2 Sep 2016 22:24:11 +0000 (15:24 -0700)]
Doc change: remove useUpdatedTemplates script and sections using old templates.
Change-Id: I7c4e8f36125ad120699d5b2c66bea29433fecf59
smain@google.com [Sat, 3 Sep 2016 01:19:05 +0000 (01:19 +0000)]
remove 'useUpdatedTemplates' flag that's no longer supported. Fix build.
am:
7dd9749246
Change-Id: I5a048d040dd040f40d0b5e30ea67e62de4cf7259
smain@google.com [Sat, 3 Sep 2016 01:10:29 +0000 (18:10 -0700)]
remove 'useUpdatedTemplates' flag that's no longer supported. Fix build.
Change-Id: Ic1778b6e3044c80e602f5ce9d4f825c8578c1a0a
Dirk Dougherty [Fri, 2 Sep 2016 22:31:57 +0000 (22:31 +0000)]
Merge "Remove obsolete collections and extras metadata files. Authors should use jd_extras_<lang> instead..." into nyc-dev
am:
460b9c08e6
Change-Id: I55c8a7dc7b90a12b177f3923731a2ad913bed60b
Dirk Dougherty [Fri, 2 Sep 2016 22:31:54 +0000 (22:31 +0000)]
Remove obsolete collections and extras metadata files. Authors should use jd_extras_<lang> instead...
am:
169f86ce7a
Change-Id: I714461981eb3ed28178006c4acf4cd111204b4bb
Dirk Dougherty [Fri, 2 Sep 2016 22:26:59 +0000 (22:26 +0000)]
Merge "Remove obsolete collections and extras metadata files. Authors should use jd_extras_<lang> instead..." into nyc-dev
Scott Main [Fri, 2 Sep 2016 21:36:21 +0000 (21:36 +0000)]
Merge "switch all API builds to use template-sdk instead of (soon to be deleted) templates-sdk-dev. also update all non-DAC builds to use the "referenceonly" flag for a cleaner output and faster build." into nyc-dev
am:
915b566ef0
Change-Id: Id9917788f79f73a7a7f4caa1d45508ae50c00337