Mark Salyzyn
e810c7296e
am 97c10907: Merge "logd: report reinit"
...
* commit '97c10907b5a034b8500aadcdf7f8829099b4b5f0':
logd: report reinit
2015-03-13 21:16:46 +00:00
Dmitriy Ivanov
821b8570c7
Merge "Switch liblog to sysv-only hash style"
2015-03-13 21:06:01 +00:00
Mark Salyzyn
97c10907b5
Merge "logd: report reinit"
2015-03-13 21:02:17 +00:00
Jeff Sharkey
707d4f2ee8
Merge "Define enum class for NetlinkEvent actions."
2015-03-13 20:47:47 +00:00
Jeff Sharkey
e4f394087d
Define enum class for NetlinkEvent actions.
...
This lets us use it for switch statements, and gives us stronger
type safety.
Change-Id: Idb3ad7098657a09f13c95dc7070611d35ede66ae
2015-03-13 13:27:56 -07:00
Dmitriy Ivanov
28a3b7cae0
Switch liblog to sysv-only hash style
...
Bug: 19059885
Change-Id: I5519a4e19716303692d4117bc24988f21d5a829e
2015-03-13 12:51:02 -07:00
Jeff Brown
72af28c28e
Merge "Fix issues related to removing Looper callbacks after close."
2015-03-13 19:12:10 +00:00
Elliott Hughes
dc2769d163
am 8c09e148: am 0f6286d7: Merge "Remove getsebool/setsebool from init and toolbox."
...
* commit '8c09e148fa88ceab81afd1ca2d3bf39a62e3b227':
Remove getsebool/setsebool from init and toolbox.
2015-03-13 18:21:41 +00:00
Elliott Hughes
8c09e148fa
am 0f6286d7: Merge "Remove getsebool/setsebool from init and toolbox."
...
* commit '0f6286d7052a2e7b3d82595b2d217b4df2dfb7f8':
Remove getsebool/setsebool from init and toolbox.
2015-03-13 18:16:47 +00:00
Elliott Hughes
0f6286d705
Merge "Remove getsebool/setsebool from init and toolbox."
2015-03-13 17:52:11 +00:00
Stephen Smalley
d4b2d8923f
Remove getsebool/setsebool from init and toolbox.
...
These were leftovers from the SELinux boolean support that
was originally merged. Since Android prohibits SELinux policy
booleans, we can just drop it.
Change-Id: I02f646a7d8db65e153702205b082b87a73f60d73
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-03-13 14:01:58 -04:00
Narayan Kamath
b188cd76f8
Fix a wonkily named function.
...
I'm going to delete this shortly, but this name has confused
me in the past.
Change-Id: I5e5af7f9f61c3df273bada0808cf647daeaa4e62
2015-03-13 17:11:39 +00:00
Elliott Hughes
b5662f9323
am 7f0564ba: am 48f25fa9: Merge "adb doesn\'t actually use libzipfile."
...
* commit '7f0564bab89da86886bbd82ecea84acd409ba0d9':
adb doesn't actually use libzipfile.
2015-03-13 17:09:13 +00:00
Elliott Hughes
7f0564bab8
am 48f25fa9: Merge "adb doesn\'t actually use libzipfile."
...
* commit '48f25fa974b6ac620d62a54764294acb4aed10a3':
adb doesn't actually use libzipfile.
2015-03-13 17:03:32 +00:00
Elliott Hughes
48f25fa974
Merge "adb doesn't actually use libzipfile."
2015-03-13 16:49:13 +00:00
Elliott Hughes
46270d233a
adb doesn't actually use libzipfile.
...
Change-Id: Ia7d22214bc8422c88edaaf9bb716d7e12e0bb381
2015-03-13 09:40:45 -07:00
Dmitriy Ivanov
dbf4cbe41b
am dc5f1db8: am 43b89c8e: Merge "Allocate buffers on the heap"
...
* commit 'dc5f1db8e05df56c087fef0c90e876c94bb62b73':
Allocate buffers on the heap
2015-03-13 07:35:02 +00:00
Mark Salyzyn
7ad506839a
am 6025a2bc: am bd518bce: Merge changes I3187aa34,Iadac58e6
...
* commit '6025a2bc493534b3003ebd2ad7130366cf4f6723':
init.rc: logd --reinit on changes to persistent properties
logd: add reinit command
2015-03-13 07:09:39 +00:00
Mark Salyzyn
959470f722
am 76d59f3d: am 54c22e5b: Merge "logcat: test: logcat.logrotate fails"
...
* commit '76d59f3d1093070f78913ccec35a28d4cd66803d':
logcat: test: logcat.logrotate fails
2015-03-13 07:09:38 +00:00
Mark Salyzyn
61e8b3855d
am 77b87b5b: am ecd993d7: Merge "logcat: fortify help on filterspec"
...
* commit '77b87b5b863c643bbec4864fcebf4adf99933149':
logcat: fortify help on filterspec
2015-03-13 07:09:37 +00:00
Nick Kralevich
3c6ec13fe1
am 0d6fca8a: am 7e9fe7d8: Merge "builtins: remove setenforce command"
...
* commit '0d6fca8a4f9a89752d80296abb4031aafe070b9f':
builtins: remove setenforce command
2015-03-13 06:33:07 +00:00
Elliott Hughes
76e563a718
am b02a734d: am 0a92c8c4: Merge "Fix a printf format string (caught by clang but not GCC)."
...
* commit 'b02a734d4cf8d9d2032fb167dcecf530ea8ea303':
Fix a printf format string (caught by clang but not GCC).
2015-03-13 02:58:14 +00:00
Jeff Brown
e7d54f80cb
Fix issues related to removing Looper callbacks after close.
...
When a file descriptor is closed before removing it from the
epoll set, it will normally be removed automatically from the
epoll set by the kernel. However if there exists a duplicate
then the original file descriptor may remain in the set and
continue to receive events until all duplicates have been closed.
Unfortunately due to kernel limitations we need to rebuild the epoll
set from scratch because it may contain an old file handle that we are
now unable to remove since its file descriptor is no longer valid.
No such problem would have occurred if we were using the poll system
call instead, but that approach carries others disadvantages.
Bug: 19715279
Change-Id: If1ab8ebda0825755a416d513e888942a02ee3948
2015-03-12 19:44:49 -07:00
Dan Albert
47145db46e
resolved conflicts for merge of 5ebc2f5b
to master
...
Change-Id: I9fdb437051e2f1c9afef13101ae40f881c4c6f19
2015-03-12 16:57:31 -07:00
Dmitriy Ivanov
dc5f1db8e0
am 43b89c8e: Merge "Allocate buffers on the heap"
...
* commit '43b89c8e950479ac1164d95ddf478206e7f52568':
Allocate buffers on the heap
2015-03-12 22:59:04 +00:00
Dmitriy Ivanov
43b89c8e95
Merge "Allocate buffers on the heap"
2015-03-12 22:42:13 +00:00
Dmitriy Ivanov
edbabfe9fe
Allocate buffers on the heap
...
Change-Id: I96c8a50e8987e8ea77d0766ccf3c619f60377864
2015-03-12 14:47:52 -07:00
Mark Salyzyn
6025a2bc49
am bd518bce: Merge changes I3187aa34,Iadac58e6
...
* commit 'bd518bce07094ccc2e91df67e072de94ca7db442':
init.rc: logd --reinit on changes to persistent properties
logd: add reinit command
2015-03-12 21:39:11 +00:00
Mark Salyzyn
76d59f3d10
am 54c22e5b: Merge "logcat: test: logcat.logrotate fails"
...
* commit '54c22e5b0af8b8799a7c473c7a76e44ca018742c':
logcat: test: logcat.logrotate fails
2015-03-12 21:39:10 +00:00
Mark Salyzyn
77b87b5b86
am ecd993d7: Merge "logcat: fortify help on filterspec"
...
* commit 'ecd993d74fafd762dad69cee97b3d84ce5806074':
logcat: fortify help on filterspec
2015-03-12 21:39:08 +00:00
Mark Salyzyn
ccbadc6be0
logd: report reinit
...
Bug: 19681572
Change-Id: I343b9d108f064f87df79512a0fdf1b35513c3136
2015-03-12 20:38:53 +00:00
Mark Salyzyn
bd518bce07
Merge changes I3187aa34,Iadac58e6
...
* changes:
init.rc: logd --reinit on changes to persistent properties
logd: add reinit command
2015-03-12 20:34:01 +00:00
Mark Salyzyn
54c22e5b0a
Merge "logcat: test: logcat.logrotate fails"
2015-03-12 20:15:17 +00:00
Mark Salyzyn
9c51243d8b
logcat: test: logcat.logrotate fails
...
Test did not handle all possible multiples of block sizes.
Bug: 19604106
Change-Id: I693358be9598926389631baf21c5883e0f2fd735
2015-03-12 20:11:36 +00:00
Mark Salyzyn
ecd993d74f
Merge "logcat: fortify help on filterspec"
2015-03-12 20:10:18 +00:00
Greg Hackmann
56350fe387
pixelflinger: make self-contained
...
pixelflinger should not be used for new projects and should be moved out
of system/core at some point. As the first step, move all its headers
under system/core/libpixelflinger/include and update its Android.mk
files so they're not referring to the absolute system/core path anymore.
Change-Id: I7acc3ef5b2e21d8ba6fe939ea8d3ec4c41959591
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-03-12 13:02:38 -07:00
Mark Salyzyn
48d06069a8
init.rc: logd --reinit on changes to persistent properties
...
Bug: 19681572
Change-Id: I3187aa348dae79fa5822ffb7ee9566919a7a04e6
2015-03-12 12:24:53 -07:00
Mark Salyzyn
11e55cb9c1
logd: add reinit command
...
- respond to SIGHUP
- respond to logd command "reinit"
- respond to logd --reinit
- reopens files on /data, eg: re-read of persistent properties
Bug: 19681572
Change-Id: Iadac58e6653f027cb7355497bd675eef376ce0a8
2015-03-12 12:24:47 -07:00
Nick Kralevich
0d6fca8a4f
am 7e9fe7d8: Merge "builtins: remove setenforce command"
...
* commit '7e9fe7d86de665bcb2615d8c24de39416c48cdec':
builtins: remove setenforce command
2015-03-12 01:04:39 +00:00
Nick Kralevich
7e9fe7d86d
Merge "builtins: remove setenforce command"
2015-03-12 00:51:49 +00:00
Nick Kralevich
cee683e290
builtins: remove setenforce command
...
Adding "setenforce 0" to init.rc isn't a supported way to turn off
SELinux, and doesn't work with AOSP SELinux policy. Remove the code
from init.
Change-Id: If8c8149560789c9a7ba518a0a100e6033bb68898
2015-03-11 17:48:45 -07:00
Sami Tolvanen
bdd7cbd85d
am fcd14f13: am 9fabbbfb: Merge "Do not call libcutils property_set in init through libfs_mgr"
...
* commit 'fcd14f13a1e05bc1958bfeaba95678b9bf4b121e':
Do not call libcutils property_set in init through libfs_mgr
2015-03-11 23:02:32 +00:00
Greg Hackmann
60d5183396
am 469c34e7: am 54352700: Merge "libadf: enable -Werror"
...
* commit '469c34e78ffe2df159dcd1977633ba35140fad03':
libadf: enable -Werror
2015-03-11 23:02:20 +00:00
Greg Hackmann
ecdf6e5cb1
am 399dcb7e: am bf36cc57: Merge "libadf: tests: fix signed/unsigned comparison warnings"
...
* commit '399dcb7e9dc42af474f593d95ff6333a6761cffe':
libadf: tests: fix signed/unsigned comparison warnings
2015-03-11 23:02:19 +00:00
Jeff Brown
7a0310ef67
Fixed subtle bugs related to file descriptor recycling.
...
Added code to protect against situations that may occur when a
Looper callback has the side-effect of closing the file descriptor that
it is watching before it returns. This code pattern is very
convenient for implementation but it does expose issues in how
the list of callbacks is maintained. In particular, we
need to watch out for file descriptors which have been reused.
This change may resolve previously unexplained ANRs associated with
log messages such as: "Error modifying epoll events for fd 44, errno=2"
Bug: 10349083
Change-Id: I20eedf6ffbdeda382653ca0104962505194741b0
2015-03-11 15:00:36 -07:00
Jeff Brown
27e5721860
Rename Looper::isIdling() to isPolling() to resolve confusion.
...
The loop isn't technically idle at this time, it's just checking
whether any file descriptors have pending events. However it's
still a good signal as to whether the loop is alive.
Bug: 19532373
Change-Id: I555c473e70ffd8a56e1b10aa60026eb674a16de9
2015-03-11 15:00:36 -07:00
Dimitry Ivanov
40ed4f5d5e
am 44ad0f9b: am ddd97caf: am b27bd948: Merge "Generate gnu hash for arm only"
...
* commit '44ad0f9b1f1f06f4db58f985c847f455c3b02e3c':
Generate gnu hash for arm only
2015-03-11 20:08:56 +00:00
Elliott Hughes
b02a734d4c
am 0a92c8c4: Merge "Fix a printf format string (caught by clang but not GCC)."
...
* commit '0a92c8c4799e86d690de860f96ad6abb86357c3b':
Fix a printf format string (caught by clang but not GCC).
2015-03-11 19:57:47 +00:00
Elliott Hughes
0a92c8c479
Merge "Fix a printf format string (caught by clang but not GCC)."
2015-03-11 19:32:47 +00:00
Elliott Hughes
58c3bacc38
Fix a printf format string (caught by clang but not GCC).
...
Change-Id: I665756615eef74b05ef92f5865d910f29ead0695
2015-03-11 12:31:53 -07:00