Mark Salyzyn
6cd488e95a
resolved conflicts for merge of faf84529 to master
...
Change-Id: Idbb7fae527bad4ae1447f95662a9ec5d5294d771
2014-05-21 10:07:55 -07:00
Mark Salyzyn
36ccca155c
Merge "toolbox: turn on -Werror"
2014-05-21 15:40:14 +00:00
Narayan Kamath
50415394c5
am b3bd09cd: am 9cbc8088: am 5f6beb12: Merge ""stop" / "start must apply to the secondary zygote as well."
...
* commit 'b3bd09cda0ff29d53e91a6ec056b30a3c8b148a2':
"stop" / "start must apply to the secondary zygote as well.
2014-05-15 09:24:12 +00:00
Narayan Kamath
5f6beb12c1
Merge ""stop" / "start must apply to the secondary zygote as well."
2014-05-15 09:15:52 +00:00
Kenny Root
7c01585339
resolved conflicts for merge of 101e92ac to master
...
Change-Id: I837bc0732c2e72d99ce47d0534915012ff43a21e
2014-05-14 17:29:21 -07:00
Elliott Hughes
569e834602
am 7c633e6f: am 233bbd9d: am ed02fbf0: Merge "Clean up some unnecessary system_properties cruft."
...
* commit '7c633e6fe6f69006ca4299a475230dd583da38f3':
Clean up some unnecessary system_properties cruft.
2014-05-15 00:08:58 +00:00
Kenny Root
d20ba7fca2
Merge "ps: add flag to show ABI"
2014-05-15 00:03:41 +00:00
Elliott Hughes
f94853f294
Clean up some unnecessary system_properties cruft.
...
Bug: 14970171
Change-Id: I6f54c35e265b849be914120f795c9f8e0cec34bb
2014-05-14 16:51:09 -07:00
Kenny Root
8f197e6579
ps: add flag to show ABI
...
Allow us to easily identify the 32/64 bitness of the process. Yes, I
know this is not technically an ABI, but it seemed close enough!
Change-Id: Ia03a17fd74d61e7619911cb26b3dd7d82b62930c
2014-05-14 16:11:37 -07:00
Mark Salyzyn
aa907768af
toolbox: turn on -Werror
...
- Deal with some signedness issues
- Deal with some size issues
- Deal with NULL pointer issues
- Deal with some -Wunused issues
Change-Id: I1479dd90d690084491bae3475f2c547833519a57
2014-05-14 12:41:24 -07:00
Narayan Kamath
22e22acbf0
"stop" / "start must apply to the secondary zygote as well.
...
Would've been nice if we could use the sys property
observer to start and stop all services in a service
class but service classes do not appear to be fully
supported.
Change-Id: Iaf17a2dbcf913c4c646bc1e8e13adee9f952c45e
2014-05-13 17:32:43 +01:00
Elliott Hughes
265a1d285e
am 0888e52f: am afe5bbef: am a67914e4: Merge "Fix top(1) SIGPIPE behavior."
...
* commit '0888e52fa8141acdcf62eff1b14059d9aab17382':
Fix top(1) SIGPIPE behavior.
2014-04-21 15:59:27 +00:00
Elliott Hughes
a67914e4d6
Merge "Fix top(1) SIGPIPE behavior."
2014-04-19 00:19:00 +00:00
Elliott Hughes
5922d3b5be
Fix top(1) SIGPIPE behavior.
...
Bug: 14166609
Change-Id: I4aad1e0db2e875735405d094fb0d1a36862b5b19
2014-04-18 16:53:04 -07:00
Colin Cross
dd8e1bbbb0
am 8d57b79c: am bf66e448: am a1551e9b: Merge "Fix buffer overflow in syren utility"
...
* commit '8d57b79c26c9618ec50d3ee304e9abba41bfe4c9':
Fix buffer overflow in syren utility
2014-04-14 15:49:17 +00:00
nks
3967f81b56
Fix buffer overflow in syren utility
...
Patch for https://code.google.com/p/android/issues/detail?id=68268
A length check for the argv[2] was added in order to prevent buffer
overflow. Also replace strcpy with strlcpy.
Signed-off-by: nks <nks@sixserv.org>
Change-Id: If65b83e9b658315c672e684f64e3ae00e69fac31
2014-04-13 10:45:30 -07:00
Elliott Hughes
241d5aa3d2
am 8f2a205f: am 1a09a804: am 47d374ec: Merge "Move date off the non-portable bionic32 \'strtotimeval\'."
...
* commit '8f2a205f34bfad9eddbd62a073d1ca492276d538':
Move date off the non-portable bionic32 'strtotimeval'.
2014-04-07 22:42:28 +00:00
Elliott Hughes
e25a6413d3
Move date off the non-portable bionic32 'strtotimeval'.
...
Change-Id: Ib706d3a536c409810cfbc47270448c6375314506
2014-04-07 15:24:47 -07:00
Mark Salyzyn
731e24e99f
am fd0f4d9a: am 8b8974ef: am 31fa9604: Merge "toolbox: ls: 64 bit compile warnings"
...
* commit 'fd0f4d9ad6e37d8047767e7e1ce9374906a3acc8':
toolbox: ls: 64 bit compile warnings
2014-03-14 21:35:41 +00:00
Mark Salyzyn
4727c7711e
toolbox: ls: 64 bit compile warnings
...
Change-Id: Ia538c7177f8d5cf2c1f0efb5b575da6527c13968
2014-03-14 13:47:16 -07:00
Mark Salyzyn
ed6178976d
am 713aedd7: am 9e38da5f: am 1a379899: Merge "toolbox: schedtop 64 bit build issue"
...
* commit '713aedd74a9e7bf81929ccd8225d2784afcbb9c9':
toolbox: schedtop 64 bit build issue
2014-03-14 17:13:11 +00:00
Mark Salyzyn
161b55fc5d
toolbox: schedtop 64 bit build issue
...
Change-Id: I77b8ca2c32b9ff33abb6acadae47f0ab47b47907
2014-03-13 17:14:15 -07:00
Dmitriy Ivanov
fbbc85ea8e
am 6bb6372b: am 508240c3: am 2a16a584: Merge "fix: making lsof show devies and loaded .so file names correctly"
...
* commit '6bb6372b3ee930e2e8517262ec7db4f057a50725':
fix: making lsof show devies and loaded .so file names correctly
2014-03-04 20:16:46 +00:00
Dmitriy Ivanov
7c1fc0ed42
fix: making lsof show devies and loaded .so file names correctly
...
Change-Id: I4b6f2e0015f8cfa18400fa4bd08460a07e29a51b
2014-03-04 11:17:57 -08:00
Elliott Hughes
6a732d423f
am 2ae567c8: am 1a5bc28f: am a0e4d164: Merge "Declare (and simplify) uid_from_user."
...
* commit '2ae567c82ee34fb7e51e797fce140313de34338b':
Declare (and simplify) uid_from_user.
2014-03-01 01:51:23 +00:00
Elliott Hughes
e12311fcb2
am f767e9c9: am 7c5a9d24: am fbcdf6f9: Merge "Switch to BSD chown (for -R, primarily)."
...
* commit 'f767e9c97a0719b342e91c7770885c108a66e02f':
Switch to BSD chown (for -R, primarily).
2014-03-01 01:31:51 +00:00
Elliott Hughes
3f6b63e74d
Declare (and simplify) uid_from_user.
...
uid_from_user doesn't need to cope with numeric ids in the BSD code
like it did with the old Android code; the caller now handles those.
Also explain what SUPPORT_DOT is for.
Change-Id: I185c9f02b7039795069aa30545563b8a6ef54cd5
2014-02-28 17:27:08 -08:00
Elliott Hughes
7bc9748420
am 1f570812: am d262b2a8: am 54bb1d3b: Merge "Fix grep -f."
...
* commit '1f57081216a2eae81672dadd67c94476b27fbf63':
Fix grep -f.
2014-03-01 01:24:37 +00:00
Elliott Hughes
fbcdf6f9fe
Merge "Switch to BSD chown (for -R, primarily)."
2014-03-01 01:18:29 +00:00
Elliott Hughes
0b024677ec
Switch to BSD chown (for -R, primarily).
...
Change-Id: I45381b8a04f4cb651123a2d43860418e06df6e65
2014-02-28 16:48:49 -08:00
Elliott Hughes
4014501d79
Fix grep -f.
...
bionic has getline now.
Change-Id: I5e4ee137768ab3113dbe8a07406fa39f4b6546af
2014-02-28 16:45:56 -08:00
Elliott Hughes
dc3dd44c02
am 51437ed2: am 56ae6b68: am 410f51a8: Merge "Remove unused #includes of <asm/page.h>."
...
* commit '51437ed26565f4bc55e516b73b7e9cafef8e012f':
Remove unused #includes of <asm/page.h>.
2014-02-24 23:53:26 +00:00
Elliott Hughes
2f77bb6931
Remove unused #includes of <asm/page.h>.
...
(<asm/page.h> is going away.)
Change-Id: Id0d7ad0eb791cd47490c48458f9f8a6468ddf5c9
2014-02-24 15:38:44 -08:00
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
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
Nick Kralevich
3049f23915
am e41420bd: am 488b5eaf: am 2e7347d6: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
...
* commit 'e41420bd8cbaa69f6eaca524b2412cb92a6d18a3':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-13 00:19:47 +00:00
Nick Kralevich
2e7347d617
Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
2014-02-12 23:09:28 +00:00
Elliott Hughes
4160507b75
am a1ebd4d5: am 696c75c1: am 829ae5be: Merge "Remove a pre-uapi hack from nandread."
...
* commit 'a1ebd4d5c8b0a038c39b568b33e89f1b998f0a73':
Remove a pre-uapi hack from nandread.
2014-02-10 12:51:27 +00:00
Elliott Hughes
2c1d62d622
Remove a pre-uapi hack from nandread.
...
We only have uapi headers now.
Change-Id: I2c02e10bb3bba4006579772f3ab2a18c2df7535d
2014-02-07 17:10:37 -08:00
Stephen Smalley
27a93650c0
Convert all selinux_android_restorecon and _setfilecon calls to new API.
...
libselinux selinux_android_restorecon API is changing to the more
general interface with flags and dropping the older variants.
Also get rid of the old, no longer used selinux_android_setfilecon API
and rename selinux_android_setfilecon2 to it as it is the only API in use.
Change-Id: I1e71ec398ccdc24cac4ec76f1b858d0f680f4925
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-02-07 09:38:32 -05:00
Nick Kralevich
b3e2d02588
am 52ca10d1: am e3b1810e: am 71de56a0: Merge "Unify toolbox restorecon and libselinux restorecon implementations."
...
* commit '52ca10d15aa803333467db456a40d2bbc89dc18e':
Unify toolbox restorecon and libselinux restorecon implementations.
2014-02-07 00:02:23 +00:00
Stephen Smalley
2761b71d3f
Unify toolbox restorecon and libselinux restorecon implementations.
...
Extend the libselinux restorecon implementation to allow reuse
by the toolbox restorecon command. This simply requires adding
support for the nochange (-n) and verbose (-v) options to the
libselinux functions and rewriting the toolbox restorecon command
to use the libselinux functions. Also add a force (-F) option to
support forcing a restorecon_recursive even if the restorecon_last
attribute matches the current file_contexts hash so that we can
continue to force a restorecon via the toolbox command for testing
or when we know something else has changed (e.g. for when we support
relabeling /data/data and package information has changed).
Change-Id: I92bb3259790a7195ba56a5e9555c3b6c76ceb862
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-02-06 09:42:04 -05:00
Sujith Ramakrishnan
42e5fda53a
Merge "Add mknod utility to system/core/toolbox"
2014-01-24 22:31:17 +00:00
Sujith Ramakrishnan
71bbbd1578
Add mknod utility to system/core/toolbox
...
Change-Id: I46586cba83ecb8095721be8ffad9e386d4698e4a
2014-01-17 19:14:47 -08:00
Elliott Hughes
5dbb002217
am 1571dac4: am 1b37794b: am f62b602f: am 6192eedb: Merge "Fix \'r\' for LP64."
...
* commit '1571dac49fee8d7304a082a787aed15520ed48b4':
Fix 'r' for LP64.
2014-01-17 20:11:24 +00:00
Elliott Hughes
2430a064bd
Fix 'r' for LP64.
...
Change-Id: I8332a0a8045a70b3992fe34b0b9e334a721265a9
2014-01-17 09:50:56 -08:00
Elliott Hughes
3215ed4228
am b1091958: am 320f2940: am e20b5f71: am 524b3a0c: Merge "Remove obsolete \'setconsole\' command."
...
* commit 'b1091958bdb4bc42f66631fdf4105cbc2faec98a':
Remove obsolete 'setconsole' command.
2014-01-17 01:06:44 +00:00
Elliott Hughes
c1e91b0034
Remove obsolete 'setconsole' command.
...
Change-Id: I643a48653006b97bb10d7b996ecc003dbafad590
2014-01-16 14:50:23 -08:00
Elliott Hughes
b70375abc2
resolved conflicts for merge of ec9e5891 to master
...
Change-Id: I704e3159d529e436e060cb66c1739ef8e7b612d4
2014-01-16 14:42:35 -08:00
Elliott Hughes
ccecf14254
system/core 64-bit cleanup.
...
This cleans up most of the size-related problems in system/core.
There are still a few changes needed for a clean 64-bit build,
but they look like they might require changes to things like the
fastboot protocol.
Change-Id: I1560425a289fa158e13e2e3173cc3e71976f92c0
2014-01-16 12:54:18 -08:00