Commit graph

7750 commits

Author SHA1 Message Date
Nick Kralevich
5a78e23a00 am 490963a5: am c0f95624: am 783eb168: Merge "Add -D option to restorecon for relabeling /data/data."
* commit '490963a54e5ef0c421f0e1ac87eafc2b46c32b95':
  Add -D option to restorecon for relabeling /data/data.
2014-02-20 23:15:40 +00:00
Elliott Hughes
09c5db8451 am 60d2f35c: am 8e66265a: am acc0a23a: Merge "Remove dead code."
* commit '60d2f35cbd11cdb43c24a1688c93677ab682e4eb':
  Remove dead code.
2014-02-20 23:15:33 +00:00
Nick Kralevich
490963a54e am c0f95624: am 783eb168: Merge "Add -D option to restorecon for relabeling /data/data."
* commit 'c0f95624ad071d925de3463f7fa5aef0663076a0':
  Add -D option to restorecon for relabeling /data/data.
2014-02-20 21:02:54 +00:00
Nick Kralevich
c0f95624ad am 783eb168: Merge "Add -D option to restorecon for relabeling /data/data."
* commit '783eb1689871850c082e0b6ccadeeccbaa81a5d2':
  Add -D option to restorecon for relabeling /data/data.
2014-02-20 21:00:36 +00:00
Nick Kralevich
783eb16898 Merge "Add -D option to restorecon for relabeling /data/data." 2014-02-20 20:54:18 +00:00
Elliott Hughes
60d2f35cbd am 8e66265a: am acc0a23a: Merge "Remove dead code."
* commit '8e66265a17e5e13843bd59282b1feacdae4b4b41':
  Remove dead code.
2014-02-20 20:15:57 +00:00
Elliott Hughes
8e66265a17 am acc0a23a: Merge "Remove dead code."
* commit 'acc0a23a20bf5e5db985661b2c8a8259d9e94498':
  Remove dead code.
2014-02-20 20:12:51 +00:00
Elliott Hughes
acc0a23a20 Merge "Remove dead code." 2014-02-20 20:06:38 +00:00
Elliott Hughes
b784f37341 Remove dead code.
We have benchmarking for memset in bionic itself, and a benchmarking
framework for other native benchmarking.

Change-Id: I241a288a96d3b2d37f3d51b04a519ac23f18a989
2014-02-20 11:12:41 -08:00
Mark Salyzyn
4046c132dc Merge changes I929dddc7,Ice88b141,I243b1338
* changes:
  logd: prune more aggressively when over the top
  logd: initial checkin.
  logcat: test: add clear and blocking check
2014-02-20 00:27:02 +00:00
JP Abgrall
d4446607b4 am c8178c85: am a0d4b9e8: am 91237300: Merge "Handle FUSE_FSYNCDIR as FUSE_FSYNC"
* commit 'c8178c85650341790d33b39cc78c4501a723279e':
  Handle FUSE_FSYNCDIR as FUSE_FSYNC
2014-02-19 20:46:02 +00:00
JP Abgrall
b3da098f5a am e752589d: am 406f1aff: am 3b0c24e2: Merge "sdcard: direct I/O file access write buffer alignment"
* commit 'e752589dcb2f0caf86697cf7b787bf7d87255b3f':
  sdcard: direct I/O file access write buffer alignment
2014-02-19 20:46:01 +00:00
JP Abgrall
c8178c8565 am a0d4b9e8: am 91237300: Merge "Handle FUSE_FSYNCDIR as FUSE_FSYNC"
* commit 'a0d4b9e8430c94a951fc8b53ca83fad20c5e11e7':
  Handle FUSE_FSYNCDIR as FUSE_FSYNC
2014-02-19 20:43:44 +00:00
JP Abgrall
e752589dcb am 406f1aff: am 3b0c24e2: Merge "sdcard: direct I/O file access write buffer alignment"
* commit '406f1aff9acebfea81568e0a257e1300e22dcfa8':
  sdcard: direct I/O file access write buffer alignment
2014-02-19 20:43:42 +00:00
JP Abgrall
a0d4b9e843 am 91237300: Merge "Handle FUSE_FSYNCDIR as FUSE_FSYNC"
* commit '912373005b53e70803cdae61dd63a18fa73a5e3e':
  Handle FUSE_FSYNCDIR as FUSE_FSYNC
2014-02-19 20:41:30 +00:00
JP Abgrall
406f1aff9a am 3b0c24e2: Merge "sdcard: direct I/O file access write buffer alignment"
* commit '3b0c24e28d7538ff5b49a98eee99bac85c8e687b':
  sdcard: direct I/O file access write buffer alignment
2014-02-19 20:37:59 +00:00
JP Abgrall
912373005b Merge "Handle FUSE_FSYNCDIR as FUSE_FSYNC" 2014-02-19 20:34:21 +00:00
Daisuke Okitsu
b2831a2db9 Handle FUSE_FSYNCDIR as FUSE_FSYNC
There have been issues with sdcard data corruption even after
successfully calling fsync for /sdcard. This is caused by
the sdcard daemon doing nothing in this case.

Change-Id: I48149ceabdac79ac535b35c2598bb1fbb5410883
2014-02-19 20:33:50 +00:00
JP Abgrall
3b0c24e28d Merge "sdcard: direct I/O file access write buffer alignment" 2014-02-19 20:30:25 +00:00
Nick Kralevich
202be73b62 am f10492d8: am 066cde92: am 223e0798: Merge "Enable building init with -Wall -Werror."
* commit 'f10492d8c0c907fad6f87c871fec6b2fac41a02c':
  Enable building init with -Wall -Werror.
2014-02-19 19:23:13 +00:00
Nick Kralevich
f10492d8c0 am 066cde92: am 223e0798: Merge "Enable building init with -Wall -Werror."
* commit '066cde92d267986424ff79f35881116da3c672f8':
  Enable building init with -Wall -Werror.
2014-02-19 19:19:06 +00:00
Nick Kralevich
066cde92d2 am 223e0798: Merge "Enable building init with -Wall -Werror."
* commit '223e07983718e1515f2a54542b9b0163a8f508ed':
  Enable building init with -Wall -Werror.
2014-02-19 19:13:39 +00:00
Nick Kralevich
223e079837 Merge "Enable building init with -Wall -Werror." 2014-02-19 19:09:30 +00:00
Stephen Smalley
eb3f421e02 Enable building init with -Wall -Werror.
Eliminates various warnings from SELinux-related code.

Bug: 12587913
Change-Id: I28921f0ebd934324436609540d95ccef58552b64
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-02-19 09:15:09 -05:00
Stephen Smalley
500308a7e6 Add -D option to restorecon for relabeling /data/data.
This depends on change I137588013ed1750315702c0dbe088ce3e4a29e83.

Change-Id: I5a4fef9affd6cddf98d72dc9d54899be25741779
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-02-18 11:15:52 -05:00
Arpad Horvath
49e9344bdd sdcard: direct I/O file access write buffer alignment
It is not enough to align the read buffer only, because
consequent writes might still fail with EINVAL. The write
buffer should be also aligned according to the write(2)
manual page.

Change-Id: I7547dec5208732c56f4466c1b0c88f36dabacf5b
2014-02-18 10:18:25 +01:00
Colin Cross
b6391ce26b am ee9de136: am bb2da79f: am 27fd413d: Merge "Start debuggerd64 for 64-bit processes"
* commit 'ee9de136c52555e8775611ad32fc8ee47c75e3d1':
  Start debuggerd64 for 64-bit processes
2014-02-16 19:57:27 +00:00
Colin Cross
ee9de136c5 am bb2da79f: am 27fd413d: Merge "Start debuggerd64 for 64-bit processes"
* commit 'bb2da79fdab68c9643a30f5156e7dcabb379b139':
  Start debuggerd64 for 64-bit processes
2014-02-16 19:54:13 +00:00
Colin Cross
bb2da79fda am 27fd413d: Merge "Start debuggerd64 for 64-bit processes"
* commit '27fd413d6d02a53c453cf926717b67e9a8d1eb32':
  Start debuggerd64 for 64-bit processes
2014-02-16 19:50:59 +00:00
Colin Cross
27fd413d6d Merge "Start debuggerd64 for 64-bit processes" 2014-02-16 19:46:55 +00:00
Dan Willemsen
78ef91aa5e Start debuggerd64 for 64-bit processes
Change-Id: I2fc33d9eb2726b043d2f13bfab0c605dbb6083c7
2014-02-16 11:30:27 -08:00
JP Abgrall
133993b486 am a183eb3e: am 6e6140e0: am f7cf1a06: Merge "sdcard: direct I/O file access fix"
* commit 'a183eb3e737eda4de270b31b1a71462aed49eee9':
  sdcard: direct I/O file access fix
2014-02-15 01:04:38 +00:00
JP Abgrall
a183eb3e73 am 6e6140e0: am f7cf1a06: Merge "sdcard: direct I/O file access fix"
* commit '6e6140e0ad0575496cfbd6dd3c1eec5d53cb6e6a':
  sdcard: direct I/O file access fix
2014-02-15 01:01:20 +00:00
JP Abgrall
6e6140e0ad am f7cf1a06: Merge "sdcard: direct I/O file access fix"
* commit 'f7cf1a062ef27b6579b9afb876d635a307b3d5d3':
  sdcard: direct I/O file access fix
2014-02-15 00:59:15 +00:00
JP Abgrall
f7cf1a062e Merge "sdcard: direct I/O file access fix" 2014-02-15 00:52:54 +00:00
Arpad Horvath
80b435a3f3 sdcard: direct I/O file access fix
If a file is opened in direct I/O mode (with O_DIRECT flag),
the read buffer addess must be aligned to memory page size
boundary. The Direct I/O is not needed for normal files,
however, some special hardware access (e.g. smart SD cards)
will not work without it.

Change-Id: I42babeee86dba1880fd23e2592fddd7060da3e20
2014-02-14 16:50:27 -08:00
Mark Salyzyn
63c15d5061 logd: prune more aggressively when over the top
Change-Id: I929dddc7da048c032fb791c7af23f215f8856bf3
2014-02-14 11:07:54 -08:00
Nick Kralevich
3e76e0a497 logd: initial checkin.
* Create a new userspace log daemon for handling logging messages.

Original-Change-Id: I75267df16359684490121e6c31cca48614d79856
Signed-off-by: Nick Kralevich <nnk@google.com>

* Merge conflicts
* rename new syslog daemon to logd to prevent confusion with bionic syslog
* replace racy getGroups call with KISS call to client->getGid()
* Timestamps are filed at logging source
* insert entries into list in timestamp order
* Added LogTimeEntry tail filtration handling
* Added region locking around LogWriter list
* separate threads for each writer
* /dev/socket/logd* permissions

Signed-off-by: Mark Salyzyn <salyzyn@google.com>

Change-Id: Ice88b1412d8f9daa7f9119b2b5aaf684a5e28098
2014-02-14 11:07:54 -08:00
Paul Lawrence
b6e3b3cea2 Merge "Mount default encrypted devices at boot" 2014-02-14 15:24:41 +00:00
Mark Salyzyn
1beb2ab6f6 logcat: test: add clear and blocking check
Change-Id: I243b1338c4a5935a297a0519c03697fd828e47e6
2014-02-13 18:57:59 -08:00
Nick Kralevich
0f18bb1fe0 Merge "lowmemorykiller: make perms 0220" 2014-02-13 22:10:48 +00:00
Nick Kralevich
b3739735b8 lowmemorykiller: make perms 0220
Set

* /sys/module/lowmemorykiller/parameters/adj
* /sys/module/lowmemorykiller/parameters/minfree

to 0220. This better indicates that these files are only intended
to be written to, never read.

Change-Id: I9ef054f032b3955e04128fc1a472a17c7b1fa792
2014-02-13 13:58:21 -08:00
Colin Cross
1c38f5d958 resolved conflicts for merge of 1fef485f to master
Change-Id: If402e68292a183064afe35cb77a4437682ee373a
2014-02-13 13:34:37 -08:00
Colin Cross
1fef485fcc am 2bcf2437: am d0307bee: Merge "charger: add locale global variable"
* commit '2bcf2437c80dbb1d7520b2a5688d4ad7b38dad51':
  charger: add locale global variable
2014-02-13 21:19:16 +00:00
Colin Cross
2bcf2437c8 am d0307bee: Merge "charger: add locale global variable"
* commit 'd0307beeef57b9db06b82f1ffba746c5decb0b72':
  charger: add locale global variable
2014-02-13 21:15:42 +00:00
Colin Cross
d0307beeef Merge "charger: add locale global variable" 2014-02-13 21:09:37 +00:00
Colin Cross
fb31448b6f am c5f3e0dc: am 594f0917: am a6b77056: Merge "build debuggerd and debuggerd64 on 64-bit architectures"
* commit 'c5f3e0dc092a3132b93d6784103c089ea9cf12ce':
  build debuggerd and debuggerd64 on 64-bit architectures
2014-02-13 20:38:00 +00:00
Colin Cross
c5f3e0dc09 am 594f0917: am a6b77056: Merge "build debuggerd and debuggerd64 on 64-bit architectures"
* commit '594f0917000de7cc8bd8f184eede96a17cafd777':
  build debuggerd and debuggerd64 on 64-bit architectures
2014-02-13 20:35:38 +00:00
Colin Cross
594f091700 am a6b77056: Merge "build debuggerd and debuggerd64 on 64-bit architectures"
* commit 'a6b770566e62196f2fff8ab25952c33deed90ea8':
  build debuggerd and debuggerd64 on 64-bit architectures
2014-02-13 20:30:14 +00:00
Colin Cross
ca0e5044a3 charger: add locale global variable
Some functions in minui reference a global extern char *locale.  None
of them are used by charger, but the bfd linker cannot optimize them
out and fails to link charger.  Define char *locale in charger.c
so it can resolve the symbol.

Change-Id: I738daf95d24356bf96bd226d91a5dc64b5d4dc9b
2014-02-13 12:25:21 -08:00