summaryrefslogtreecommitdiffstats
path: root/toolbox
Commit message (Collapse)AuthorAgeFilesLines
* am b3bd09cd: am 9cbc8088: am 5f6beb12: Merge ""stop" / "start must apply to ↵Narayan Kamath2014-05-152-0/+2
|\ | | | | | | | | | | | | the secondary zygote as well." * commit 'b3bd09cda0ff29d53e91a6ec056b30a3c8b148a2': "stop" / "start must apply to the secondary zygote as well.
| * Merge ""stop" / "start must apply to the secondary zygote as well."Narayan Kamath2014-05-152-0/+2
| |\
| | * "stop" / "start must apply to the secondary zygote as well.Narayan Kamath2014-05-132-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | resolved conflicts for merge of 101e92ac to masterKenny Root2014-05-141-4/+47
|\ \ \ | |/ / | | | | | | Change-Id: I837bc0732c2e72d99ce47d0534915012ff43a21e
| * | Merge "ps: add flag to show ABI"Kenny Root2014-05-151-4/+47
| |\ \
| | * | ps: add flag to show ABIKenny Root2014-05-141-4/+47
| | |/ | | | | | | | | | | | | | | | | | | 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
* | | am 7c633e6f: am 233bbd9d: am ed02fbf0: Merge "Clean up some unnecessary ↵Elliott Hughes2014-05-151-3/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | system_properties cruft." * commit '7c633e6fe6f69006ca4299a475230dd583da38f3': Clean up some unnecessary system_properties cruft.
| * | Clean up some unnecessary system_properties cruft.Elliott Hughes2014-05-141-3/+0
| |/ | | | | | | | | Bug: 14970171 Change-Id: I6f54c35e265b849be914120f795c9f8e0cec34bb
* | am 0888e52f: am afe5bbef: am a67914e4: Merge "Fix top(1) SIGPIPE behavior."Elliott Hughes2014-04-212-12/+17
|\ \ | |/ | | | | | | * commit '0888e52fa8141acdcf62eff1b14059d9aab17382': Fix top(1) SIGPIPE behavior.
| * Merge "Fix top(1) SIGPIPE behavior."Elliott Hughes2014-04-192-12/+17
| |\
| | * Fix top(1) SIGPIPE behavior.Elliott Hughes2014-04-182-12/+17
| | | | | | | | | | | | | | | Bug: 14166609 Change-Id: I4aad1e0db2e875735405d094fb0d1a36862b5b19
* | | am 8d57b79c: am bf66e448: am a1551e9b: Merge "Fix buffer overflow in syren ↵Colin Cross2014-04-141-2/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | utility" * commit '8d57b79c26c9618ec50d3ee304e9abba41bfe4c9': Fix buffer overflow in syren utility
| * | Fix buffer overflow in syren utilitynks2014-04-131-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 8f2a205f: am 1a09a804: am 47d374ec: Merge "Move date off the non-portable ↵Elliott Hughes2014-04-071-4/+34
|\ \ \ | |/ / | | | | | | | | | | | | | | | bionic32 \'strtotimeval\'." * commit '8f2a205f34bfad9eddbd62a073d1ca492276d538': Move date off the non-portable bionic32 'strtotimeval'.
| * | Move date off the non-portable bionic32 'strtotimeval'.Elliott Hughes2014-04-071-4/+34
| |/ | | | | | | Change-Id: Ib706d3a536c409810cfbc47270448c6375314506
* | am fd0f4d9a: am 8b8974ef: am 31fa9604: Merge "toolbox: ls: 64 bit compile ↵Mark Salyzyn2014-03-141-3/+3
|\ \ | |/ | | | | | | | | | | warnings" * commit 'fd0f4d9ad6e37d8047767e7e1ce9374906a3acc8': toolbox: ls: 64 bit compile warnings
| * toolbox: ls: 64 bit compile warningsMark Salyzyn2014-03-141-3/+3
| | | | | | | | Change-Id: Ia538c7177f8d5cf2c1f0efb5b575da6527c13968
* | am 713aedd7: am 9e38da5f: am 1a379899: Merge "toolbox: schedtop 64 bit build ↵Mark Salyzyn2014-03-141-15/+13
|\ \ | |/ | | | | | | | | | | issue" * commit '713aedd74a9e7bf81929ccd8225d2784afcbb9c9': toolbox: schedtop 64 bit build issue
| * toolbox: schedtop 64 bit build issueMark Salyzyn2014-03-131-15/+13
| | | | | | | | Change-Id: I77b8ca2c32b9ff33abb6acadae47f0ab47b47907
* | am 6bb6372b: am 508240c3: am 2a16a584: Merge "fix: making lsof show devies ↵Dmitriy Ivanov2014-03-041-1/+1
|\ \ | |/ | | | | | | | | | | and loaded .so file names correctly" * commit '6bb6372b3ee930e2e8517262ec7db4f057a50725': fix: making lsof show devies and loaded .so file names correctly
| * fix: making lsof show devies and loaded .so file names correctlyDmitriy Ivanov2014-03-041-1/+1
| | | | | | | | Change-Id: I4b6f2e0015f8cfa18400fa4bd08460a07e29a51b
* | am 2ae567c8: am 1a5bc28f: am a0e4d164: Merge "Declare (and simplify) ↵Elliott Hughes2014-03-013-12/+41
|\ \ | |/ | | | | | | | | | | uid_from_user." * commit '2ae567c82ee34fb7e51e797fce140313de34338b': Declare (and simplify) uid_from_user.
| * Declare (and simplify) uid_from_user.Elliott Hughes2014-02-283-12/+41
| | | | | | | | | | | | | | | | | | 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
* | am f767e9c9: am 7c5a9d24: am fbcdf6f9: Merge "Switch to BSD chown (for -R, ↵Elliott Hughes2014-03-013-69/+354
|\ \ | |/ | | | | | | | | | | primarily)." * commit 'f767e9c97a0719b342e91c7770885c108a66e02f': Switch to BSD chown (for -R, primarily).
| * Merge "Switch to BSD chown (for -R, primarily)."Elliott Hughes2014-03-013-69/+354
| |\
| | * Switch to BSD chown (for -R, primarily).Elliott Hughes2014-02-283-69/+354
| | | | | | | | | | | | Change-Id: I45381b8a04f4cb651123a2d43860418e06df6e65
* | | am 1f570812: am d262b2a8: am 54bb1d3b: Merge "Fix grep -f."Elliott Hughes2014-03-011-2/+0
|\ \ \ | |/ / | | | | | | | | | * commit '1f57081216a2eae81672dadd67c94476b27fbf63': Fix grep -f.
| * | Fix grep -f.Elliott Hughes2014-02-281-2/+0
| |/ | | | | | | | | | | bionic has getline now. Change-Id: I5e4ee137768ab3113dbe8a07406fa39f4b6546af
* | am 51437ed2: am 56ae6b68: am 410f51a8: Merge "Remove unused #includes of ↵Elliott Hughes2014-02-243-3/+0
|\ \ | |/ | | | | | | | | | | <asm/page.h>." * commit '51437ed26565f4bc55e516b73b7e9cafef8e012f': Remove unused #includes of <asm/page.h>.
| * Remove unused #includes of <asm/page.h>.Elliott Hughes2014-02-243-3/+0
| | | | | | | | | | | | (<asm/page.h> is going away.) Change-Id: Id0d7ad0eb791cd47490c48458f9f8a6468ddf5c9
* | am 490963a5: am c0f95624: am 783eb168: Merge "Add -D option to restorecon ↵Nick Kralevich2014-02-201-2/+5
|\ \ | |/ | | | | | | | | | | for relabeling /data/data." * commit '490963a54e5ef0c421f0e1ac87eafc2b46c32b95': Add -D option to restorecon for relabeling /data/data.
| * Add -D option to restorecon for relabeling /data/data.Stephen Smalley2014-02-181-2/+5
| | | | | | | | | | | | | | This depends on change I137588013ed1750315702c0dbe088ce3e4a29e83. Change-Id: I5a4fef9affd6cddf98d72dc9d54899be25741779 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | am e41420bd: am 488b5eaf: am 2e7347d6: Merge "Convert all ↵Nick Kralevich2014-02-131-1/+1
|\ \ | |/ | | | | | | | | | | selinux_android_restorecon and _setfilecon calls to new API." * commit 'e41420bd8cbaa69f6eaca524b2412cb92a6d18a3': Convert all selinux_android_restorecon and _setfilecon calls to new API.
| * Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."Nick Kralevich2014-02-121-1/+1
| |\
| | * Convert all selinux_android_restorecon and _setfilecon calls to new API.Stephen Smalley2014-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | am a1ebd4d5: am 696c75c1: am 829ae5be: Merge "Remove a pre-uapi hack from ↵Elliott Hughes2014-02-101-4/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | nandread." * commit 'a1ebd4d5c8b0a038c39b568b33e89f1b998f0a73': Remove a pre-uapi hack from nandread.
| * | Remove a pre-uapi hack from nandread.Elliott Hughes2014-02-071-4/+0
| |/ | | | | | | | | | | We only have uapi headers now. Change-Id: I2c02e10bb3bba4006579772f3ab2a18c2df7535d
* | am 52ca10d1: am e3b1810e: am 71de56a0: Merge "Unify toolbox restorecon and ↵Nick Kralevich2014-02-071-92/+15
|\ \ | |/ | | | | | | | | | | libselinux restorecon implementations." * commit '52ca10d15aa803333467db456a40d2bbc89dc18e': Unify toolbox restorecon and libselinux restorecon implementations.
| * Unify toolbox restorecon and libselinux restorecon implementations.Stephen Smalley2014-02-061-92/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge "Add mknod utility to system/core/toolbox"Sujith Ramakrishnan2014-01-242-0/+96
|\ \
| * | Add mknod utility to system/core/toolboxSujith Ramakrishnan2014-01-172-0/+96
| | | | | | | | | | | | Change-Id: I46586cba83ecb8095721be8ffad9e386d4698e4a
* | | am 1571dac4: am 1b37794b: am f62b602f: am 6192eedb: Merge "Fix \'r\' for LP64."Elliott Hughes2014-01-171-25/+31
|\ \ \ | | |/ | |/| | | | | | | * commit '1571dac49fee8d7304a082a787aed15520ed48b4': Fix 'r' for LP64.
| * | Fix 'r' for LP64.Elliott Hughes2014-01-171-25/+31
| | | | | | | | | | | | Change-Id: I8332a0a8045a70b3992fe34b0b9e334a721265a9
* | | am b1091958: am 320f2940: am e20b5f71: am 524b3a0c: Merge "Remove obsolete ↵Elliott Hughes2014-01-172-162/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | \'setconsole\' command." * commit 'b1091958bdb4bc42f66631fdf4105cbc2faec98a': Remove obsolete 'setconsole' command.
| * | Remove obsolete 'setconsole' command.Elliott Hughes2014-01-162-162/+0
| | | | | | | | | | | | Change-Id: I643a48653006b97bb10d7b996ecc003dbafad590
* | | resolved conflicts for merge of ec9e5891 to masterElliott Hughes2014-01-169-28/+15
|\ \ \ | |/ / | | / | |/ |/| Change-Id: I704e3159d529e436e060cb66c1739ef8e7b612d4
| * system/core 64-bit cleanup.Elliott Hughes2014-01-169-28/+15
| | | | | | | | | | | | | | | | | | 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
* | am 58c4a7dd: am e3cd2168: am 709543a9: am 08a140e6: Merge "toolbox: Fix date ↵Benoit Goby2014-01-101-1/+1
|\ \ | |/ | | | | | | | | | | tool with /dev/alarm" * commit '58c4a7ddf227bd6977677f4c8046eab6376477b3': toolbox: Fix date tool with /dev/alarm
| * toolbox: Fix date tool with /dev/alarmBenoit Goby2014-01-091-1/+1
| | | | | | | | | | Change-Id: I6f8ad2149244c89690d5d5caae8ec55429462210 Signed-off-by: Benoit Goby <benoit@android.com>
* | am 16f0d3dc: am e61495c9: am 2ab2e110: am bc836220: Merge "SWAP_FLAG_* ↵Elliott Hughes2014-01-081-6/+0
|\ \ | |/ | | | | | | | | | | constants are now in <sys/swap.h>." * commit '16f0d3dc3ac3ca1e47b67ae28f96c8814f2375bd': SWAP_FLAG_* constants are now in <sys/swap.h>.
generated by cgit v1.1 at 2024-11-12 13:17:38 +0000