OSDN Git Service
Yi Kong [Thu, 8 Sep 2016 10:12:54 +0000 (10:12 +0000)]
Merge "Track libcore change
76fa41aa4ac891670446592243b654fac7deb53f" am:
3bc37e9cf7
am:
b2d6acaa2b
Change-Id: I756b0c2366737f22447ead5f26435ffb4b0425cb
Yi Kong [Thu, 8 Sep 2016 10:07:06 +0000 (10:07 +0000)]
Merge "Track libcore change
76fa41aa4ac891670446592243b654fac7deb53f"
am:
3bc37e9cf7
Change-Id: Ia12afe847d012cbc55e5b043074e4e6c7864a52c
Yi Kong [Thu, 8 Sep 2016 09:59:54 +0000 (09:59 +0000)]
Narayan Kamath [Thu, 8 Sep 2016 09:16:14 +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: I1a22c2863405a477628807c835ef618a83519def
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:49 +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: Ib0ff7e81f890d162c0b8000ce9894ef988f188da
Narayan Kamath [Thu, 8 Sep 2016 08:57:44 +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: I07c03beef5044d020390108eadc995f443d6ae9b
Narayan Kamath [Thu, 8 Sep 2016 08:49:39 +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: I5ca638d1b740f08841cbfe9b2da4ae697009ab8e
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:20 +0000 (07:47 +0000)]
Merge "Backport changes to whitelist sockets opened by the zygote." into nyc-dev
am:
15ab539368
Change-Id: I38d078326cae81c96e240b8a6c03f4a1289e94ea
Narayan Kamath [Thu, 8 Sep 2016 07:41:43 +0000 (07:41 +0000)]
Backport changes to whitelist sockets opened by the zygote.
am:
a1252ccbdb
Change-Id: I9f784675eae1aa7879848d397bb03226012e3d26
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 [Wed, 7 Sep 2016 23:53:26 +0000 (23:53 +0000)]
Merge "docs: Added item to Support Library revision history" into nyc-dev
am:
bdbed7857b
Change-Id: I7779d2bf4a1677330debd37740bcfba8b85b1b90
Andrew Solovay [Wed, 7 Sep 2016 23:53:12 +0000 (23:53 +0000)]
docs: Added item to Support Library revision history
am:
89e77eb55c
Change-Id: I0dc851f894ea806de74029a117760c7f49013052
Scott Main [Wed, 7 Sep 2016 23:46:09 +0000 (23:46 +0000)]
Merge "revisions to the Building Your First app class with feedback from mpawlan (thank you!)" into nyc-dev
am:
9635756473
Change-Id: I23b309642a1c7585031ea2853fa7e99bddffb83a
smain@google.com [Wed, 7 Sep 2016 23:46:05 +0000 (23:46 +0000)]
revisions to the Building Your First app class with feedback from mpawlan (thank you!)
am:
14f51a724e
Change-Id: Ia4f3094843947f7e0b92bb4430265ff884a05a9c
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:37 +0000 (23:29 +0000)]
Merge "docs: fix grammar mistake in TextureView" into nyc-dev
am:
2b05f12911
Change-Id: I4317e54d15d3c0125f83a9d6b4e28f40823f15b0
Mark Lu [Wed, 7 Sep 2016 23:29:26 +0000 (23:29 +0000)]
docs: fix grammar mistake in TextureView
am:
e8691d19cb
Change-Id: I06b70cf94595bbb1b3903b1d17d201ac86f169a0
Mark Lu [Wed, 7 Sep 2016 23:24:09 +0000 (23:24 +0000)]
Merge "docs: fix grammar mistake in TextureView" into nyc-dev
Robin Lee [Wed, 7 Sep 2016 22:15:27 +0000 (22:15 +0000)]
Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev
am:
fb2cdce7c2
Change-Id: Ib97afbd6e74bc4b35cd6a5014815c3f801078413
Robin Lee [Wed, 7 Sep 2016 22:15:22 +0000 (22:15 +0000)]
DO NOT MERGE Stop work challenge freeform bypass
am:
0737c2b4c2
Change-Id: Ib613296306978c0bfbf1ea6e1dcdb7a72b867a55
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
Roshan Pius [Wed, 7 Sep 2016 21:57:25 +0000 (21:57 +0000)]
Merge "WifiManager: Remove unused methods" am:
efb7bec56a
am:
718c90daf1
Change-Id: I8f2ead6f404dd3bdb1106d22f2fde756daef4cc8
Roshan Pius [Wed, 7 Sep 2016 21:51:18 +0000 (21:51 +0000)]
Merge "WifiManager: Remove unused methods"
am:
efb7bec56a
Change-Id: I68d2ee571f04136a7c4babbdfa097d5449cc5ac3
Treehugger Robot [Wed, 7 Sep 2016 21:43:19 +0000 (21:43 +0000)]
Merge "WifiManager: Remove unused methods"
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:58:34 +0000 (20:58 +0000)]
Merge "Support library 24.2.0 API diff" into nyc-dev
am:
9d25bf73a4
Change-Id: I52810f4fc94086fd23b00bd381c82c71ee5fbfd7
Alan Viverette [Wed, 7 Sep 2016 20:58:27 +0000 (20:58 +0000)]
Support library 24.2.0 API diff
am:
ae3fecc1a9
Change-Id: Id53c9b41740e22ee7d14f6d037de63b000a7baff
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:37:01 +0000 (20:37 +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: I9b47f64c25964c2ca1e91451f0a47002b5d01593
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:47 +0000 (20:25 +0000)]
Merge "docs: Fixing redirect file" into nyc-dev
am:
33831c02b5
Change-Id: I581a03e4ae3bff311f1ae17dbaf2281d0389947b
Andrew Solovay [Wed, 7 Sep 2016 20:25:43 +0000 (20:25 +0000)]
docs: Fixing redirect file
am:
5bf2ea6670
Change-Id: I52063f29a2adee8e11c528c3268b26a0120c2afc
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
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:49 +0000 (19:07 +0000)]
Merge "docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI" into nyc-dev
am:
4dc743ac67
Change-Id: Ia0fa62280c8409ce774a5f3ffb90f71eb081e7e1
Andrew Solovay [Wed, 7 Sep 2016 19:07:39 +0000 (19:07 +0000)]
docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI
am:
7cfe9f83ac
Change-Id: Id52ee115f9aa58f87e9965dad972c9faa3e72fd6
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
Iliyan Malchev [Wed, 7 Sep 2016 18:22:44 +0000 (18:22 +0000)]
Merge changes from topic 'fix-nyc-dev-plus-aosp' into nyc-dev-plus-aosp
* changes:
Move Status to libhidl
Adds framework support for hidl-gen Java backend. (to support structs)
Add Bool* APIs to HwParcel
Link against libhidl for HidlSupport/svcmgr
Support one-way methods in java support for hardware binder
Initial commit of Java support for hardware binder
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
Yi Kong [Mon, 29 Aug 2016 15:47:00 +0000 (16:47 +0100)]
Track libcore change
76fa41aa4ac891670446592243b654fac7deb53f
Bug:
30992227
Change-Id: I33c25562468f5803e211910f50116b501b66fe56
Roshan Pius [Wed, 7 Sep 2016 16:00:36 +0000 (16:00 +0000)]
Merge "WifiEnterpriseConfig: Refactor set/get field values" am:
c4856bd73c
am:
655ae32d57
Change-Id: I2c5652450f774ed7841763898be7e3850af111a9
Roshan Pius [Wed, 7 Sep 2016 15:55:32 +0000 (15:55 +0000)]
Merge "WifiEnterpriseConfig: Refactor set/get field values"
am:
c4856bd73c
Change-Id: Id78dd9286f755f4cd1a9057f42972b8bfdc5caa9
Roshan Pius [Wed, 7 Sep 2016 15:47:39 +0000 (15:47 +0000)]
Merge "WifiEnterpriseConfig: Refactor set/get field values"
Martijn Coenen [Wed, 31 Aug 2016 23:37:05 +0000 (01:37 +0200)]
Move Status to libhidl
Bug:
31226252
Change-Id: Ieb0adcf1fa71d6859324c2d83841685d1e1a22f8
Signed-off-by: Iliyan Malchev <malchev@google.com>
Andreas Huber [Thu, 25 Aug 2016 18:21:21 +0000 (11:21 -0700)]
Adds framework support for hidl-gen Java backend. (to support structs)
Bug:
30575790
Change-Id: Ida30d8fe7a1b210e98f1a0ea5d429a0112f9ef3f
Signed-off-by: Iliyan Malchev <malchev@google.com>
Andreas Huber [Wed, 24 Aug 2016 23:19:03 +0000 (16:19 -0700)]
Add Bool* APIs to HwParcel
Bug:
31045584
Change-Id: I202c4aa7caf92a4cd7e3a45ef6784638e41facc8
Signed-off-by: Iliyan Malchev <malchev@google.com>
Martijn Coenen [Fri, 19 Aug 2016 12:23:42 +0000 (14:23 +0200)]
Link against libhidl for HidlSupport/svcmgr
Bug:
30839546
Change-Id: I52609576aa7f10da608725ef4ea78b778f127eef
Signed-off-by: Iliyan Malchev <malchev@google.com>
Andreas Huber [Thu, 18 Aug 2016 21:29:40 +0000 (14:29 -0700)]
Support one-way methods in java support for hardware binder
Bug:
30922538
Change-Id: I5ff93126a29f6bff42dee3f9868fa794ca7c077f
Signed-off-by: Iliyan Malchev <malchev@google.com>
Andreas Huber [Mon, 15 Aug 2016 16:25:02 +0000 (09:25 -0700)]
Initial commit of Java support for hardware binder
Change-Id: If1098ab921a11bae8eca2a70a3c3070e4daa0ea2
Sergio Giro [Wed, 7 Sep 2016 12:28:09 +0000 (12:28 +0000)]
Merge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)" am:
12d3d4bbba
am:
6c753ca336
Change-Id: I3f6c8546ff116fbfcf11c0c0f5b168f56503e22f
Sergio Giro [Wed, 7 Sep 2016 12:28:00 +0000 (12:28 +0000)]
Merge "java.security.PKCS12Attribute: port class from jdk8u60" am:
6767fd28b1
am:
52e0434748
Change-Id: I4e631cb3d354b2bba2dd0ced239edf60588d12a3
Sergio Giro [Wed, 7 Sep 2016 12:27:54 +0000 (12:27 +0000)]
Merge "java.security.SecureRandom: add getInstanceStrong() method" am:
4c2df18a4d
am:
09a2121d5d
Change-Id: I8e2002564fbdc2aea638538bb8954e44d882900e
Sergio Giro [Wed, 7 Sep 2016 12:23:41 +0000 (12:23 +0000)]
Merge "java.security: port DomainLoadStoreParameter from jdk8u60" am:
59c0fcf0c8
am:
290f2bb2a0
Change-Id: I0030e50dc05e88979d50e73feeb778c79ece47fc
Sergio Giro [Wed, 7 Sep 2016 12:21:36 +0000 (12:21 +0000)]
Merge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)"
am:
12d3d4bbba
Change-Id: I27e64111dc18e052884b3b571f93a17c9d5f663c
Sergio Giro [Wed, 7 Sep 2016 12:21:17 +0000 (12:21 +0000)]
Merge "java.security.PKCS12Attribute: port class from jdk8u60"
am:
6767fd28b1
Change-Id: Ib80d6ae24734def58881a4536b232870fb885015
Sergio Giro [Wed, 7 Sep 2016 12:20:49 +0000 (12:20 +0000)]
Merge "java.security.SecureRandom: add getInstanceStrong() method"
am:
4c2df18a4d
Change-Id: I5faf9c49a7d09e8eef38edd6cf32de4f65783e5d
Sergio Giro [Wed, 7 Sep 2016 12:14:47 +0000 (12:14 +0000)]
Merge "java.security: port DomainLoadStoreParameter from jdk8u60"
am:
59c0fcf0c8
Change-Id: I8fd7dc636a579c67c4b9851f4babae30e19a2024
Sergio Giro [Wed, 7 Sep 2016 12:08:27 +0000 (12:08 +0000)]
Merge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)"
Sergio Giro [Wed, 7 Sep 2016 12:07:13 +0000 (12:07 +0000)]
Merge "java.security.PKCS12Attribute: port class from jdk8u60"
Sergio Giro [Wed, 7 Sep 2016 12:05:35 +0000 (12:05 +0000)]
Merge "java.security.SecureRandom: add getInstanceStrong() method"
Sergio Giro [Wed, 7 Sep 2016 12:04:20 +0000 (12:04 +0000)]
Merge "java.security: port DomainLoadStoreParameter from jdk8u60"
Yohann Roussel [Wed, 7 Sep 2016 10:08:16 +0000 (10:08 +0000)]
Merge "Add a test app for suppressed exceptions" am:
15c6078f4d
am:
166ab31073
Change-Id: Icff43af8769359b3cc97653182831466a02b0c8f
Yohann Roussel [Wed, 7 Sep 2016 10:03:08 +0000 (10:03 +0000)]
Merge "Add a test app for suppressed exceptions"
am:
15c6078f4d
Change-Id: I45692cdf5081fe848935075d861fad11e68d19ba
Yohann Roussel [Wed, 7 Sep 2016 09:52:49 +0000 (09:52 +0000)]
Merge "Add a test app for suppressed exceptions"
Etan Cohen [Wed, 7 Sep 2016 04:40:27 +0000 (04:40 +0000)]
Merge changes from topic 'enable_nan' am:
62419a0138
am:
20d6e886a7
Change-Id: I57da3187f0373aa45b8bac0786c34e80c87cef6c
Lorenzo Colitti [Wed, 7 Sep 2016 04:33:24 +0000 (04:33 +0000)]
Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE] am:
4171cdf303 -s ours
am:
8b8bef622a -s ours
Change-Id: Id410b4653b3314766eac6b185577cc7708e0823b
Etan Cohen [Wed, 7 Sep 2016 04:33:23 +0000 (04:33 +0000)]
Merge changes from topic 'enable_nan'
am:
62419a0138
Change-Id: I98abd87843ed3f2fde6c5b1fe1234563e03e0216
Etan Cohen [Wed, 7 Sep 2016 04:33:21 +0000 (04:33 +0000)]
[NAN] Add transport type for NAN. [DO NOT MERGE] am:
bd9fdbe022 -s ours
am:
e3efe944fd -s ours
Change-Id: I439ed5ac5b70f6e693a441d8b6000f208351a3f7
Lorenzo Colitti [Wed, 7 Sep 2016 04:28:21 +0000 (04:28 +0000)]
Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE]
am:
4171cdf303 -s ours
Change-Id: I2d3f4c4b11ba2a39649c7747fbe1cee1ff16f198
Etan Cohen [Wed, 7 Sep 2016 04:27:28 +0000 (04:27 +0000)]
[NAN] Add transport type for NAN. [DO NOT MERGE]
am:
bd9fdbe022 -s ours
Change-Id: I5b313eda3f872b9938b0092d4fc197e5af8ac8b7
Etan Cohen [Wed, 7 Sep 2016 04:19:51 +0000 (04:19 +0000)]
Merge changes from topic 'enable_nan'
* changes:
Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE]
[NAN] Add transport type for NAN. [DO NOT MERGE]
Roshan Pius [Tue, 6 Sep 2016 23:12:01 +0000 (23:12 +0000)]
Merge "WifiConfiguration: Fix isEnterprise" am:
9221c96ae0
am:
e597198f12
Change-Id: I3a1f7808a4ce44f96753cb875ff914985151b208