summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* logd: liblog: logcat: Arbitrary time to tailMark Salyzyn2014-03-1413-21/+319
| | | | Change-Id: I10e8d92c933e31ee11e78d2d1114261a30c4be0e
* Merge "libdiskconfig: 64-bit issues"Mark Salyzyn2014-03-142-6/+7
|\
| * libdiskconfig: 64-bit issuesMark Salyzyn2014-03-132-6/+7
|/ | | | Change-Id: Ie5e790c36395ec2f844294b91241a8f8ba3834b8
* Merge "toolbox: schedtop 64 bit build issue"Mark Salyzyn2014-03-141-15/+13
|\
| * toolbox: schedtop 64 bit build issueMark Salyzyn2014-03-131-15/+13
|/ | | | Change-Id: I77b8ca2c32b9ff33abb6acadae47f0ab47b47907
* Merge changes I1572338c,I39965007,I521753b1Mark Salyzyn2014-03-1315-44/+1776
|\ | | | | | | | | | | | | * changes: logd: liblog: logcat: Add LogWhiteBlackList logd: prune by worst offending UID logd: liblog: logcat: Add Statistics
| * logd: liblog: logcat: Add LogWhiteBlackListMark Salyzyn2014-03-1315-68/+832
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - liblog android_logger_get_log_size and android_logger_get_readable_size adjusted to return long instead of int because of -G flag extending range NB: ifdef'd only for userdebug and eng builds - liblog Add android_logger_[sg]et_prune_list and android_logger_set_log_size - logcat Add -P, -p and -G flags - logd Add LogWhiteBlackList and configurable log size (cherry picked from commit 18a5432158ad43b8faefe4950b30e760200ce0b4) Change-Id: I1572338c1b34bd968ad7867857ef708156ec3b6a
| * logd: prune by worst offending UIDMark Salyzyn2014-03-131-1/+54
| | | | | | | | | | | | (cherry picked from commit 3c4919e4748d32d7f3e147ab57f4fafee28c7447) Change-Id: I39965007569123ff5eebe01b5bfa555bbcb2dfe7
| * logd: liblog: logcat: Add StatisticsMark Salyzyn2014-03-1311-23/+938
|/ | | | | | | | | | | - logd add statistical collection and formatting - liblog add android_logger_get_statistics call - logcat add -S flag - logcat add -b all (cherry picked from commit 51a29c8dc445e4fb89860561933e54a231e6ffb4) Change-Id: I521753b1969ecd4590c956aeeb1557d101059d67
* Merge "don't load property_contexts from /data"Nick Kralevich2014-03-121-1/+0
|\
| * don't load property_contexts from /dataNick Kralevich2014-03-111-1/+0
| | | | | | | | | | | | Bug: 12613118 Change-Id: I5a84b13d2151075d5136e3682431fbcc9307df13 (cherry picked from commit dc3a42bb11dc2aefee37f799b5a1cce87cf35aaf)
* | Merge "logd: default user space logger"Mark Salyzyn2014-03-121-2/+2
|\ \ | |/ |/|
| * logd: default user space loggerMark Salyzyn2014-03-121-2/+2
|/ | | | Change-Id: I16825c26f098241376d4014f3a8e93174387dbcf
* Merge "Added transfer progress reporting for push and pull commands."JP Abgrall2014-03-123-27/+128
|\
| * Added transfer progress reporting for push and pull commands.Mark Lindner2014-03-113-27/+128
|/ | | | | | | | | | Added a new '-p' switch to the 'push' and 'pull' commands that outputs the file transfer progress (bytes transmitted, total bytes, and % done). This provides useful feedback when transferring large files, and also makes it possible for other tools to easily monitor the progress of a forked push/pull command. Change-Id: Iee6f42f5bd41292e5bc80fba779f526f0072e356
* Merge "libadfhwc: use %zu for logging size_t"Greg Hackmann2014-03-111-1/+1
|\
| * libadfhwc: use %zu for logging size_tGreg Hackmann2014-03-111-1/+1
| | | | | | | | | | Change-Id: Ica75935a194509f9d85d8e577b81f9de03aaaea4 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | Merge "remove pixelflinger from healthd"Doug Zongker2014-03-1111-22/+22
|\ \ | |/ |/|
| * remove pixelflinger from healthdDoug Zongker2014-03-1111-22/+22
|/ | | | | | | | | | | | | | | | | | | | | | The minui library has changed to no longer use libpixelflinger. It also offers a more efficient way of storing and loading frames of animation; use it to represent the battery-full state images. Also removes the unused battery_charge.png image. Bug: 12131110 Change-Id: I6cc8b19f36a806c99cda30cc47b5968daf6b333b Conflicts: charger/charger.c charger/images/battery_0.png charger/images/battery_1.png charger/images/battery_2.png charger/images/battery_3.png charger/images/battery_4.png charger/images/battery_5.png charger/images/battery_charge.png healthd/Android.mk
* Merge "adb: Don't unlink special files on sync failure."JP Abgrall2014-03-081-5/+8
|\
| * adb: Don't unlink special files on sync failure.JP Abgrall2014-03-071-5/+8
| | | | | | | | | | | | | | | | adb push some_disk_image /dev/block/mmcblk0p9 should not unlink the dev just because adb was ctrl-c'd. Change-Id: I1b6669e8dba1f80fc1438b8deb618180b7e9a1b2 Signed-off-by: JP Abgrall <jpa@google.com>
* | Merge "adb: Don't clobber block devices during push"JP Abgrall2014-03-081-3/+6
|\|
| * adb: Don't clobber block devices during pushJP Abgrall2014-03-071-3/+6
|/ | | | | | | | | | | | | In the past, an adb push would ALWAYS unlink the target path. Now, we only links and regular files (and links). This allows the following to work: adb shell ls -l /dev/block/mmcblk0p8 # brw------- root root 179, 8 2013-11-28 07:43 mmcblk0p8 adb push n7.jpa.mda.post_jb_encryption.raw /dev/block/mmcblk0p8 Bug: 11984121 Change-Id: I982c7a1cd87986621f2bebdcb41c4e281f67f772
* Merge "libcutils: 64-bit compile issues"Mark Salyzyn2014-03-071-9/+11
|\
| * libcutils: 64-bit compile issuesMark Salyzyn2014-03-071-9/+11
| | | | | | | | | | | | - Use inttypes.h to print uint64_t values. Change-Id: Ia10a3b67cadcce282563467a464ec07066cc2051
* | Merge "ueventd: easier debug logging"Alex Ray2014-03-073-2/+11
|\ \
| * | ueventd: easier debug loggingAlex Ray2014-03-073-2/+11
| | | | | | | | | | | | | | | | | | | | | Move ueventd debug flag into the Android.mk. Boost klog level if event logging enabled. Change-Id: Iae48edbc43c487092c2424023576af29c76ff401
* | | Merge "libcutils: add method to get klog level"Alex Ray2014-03-072-0/+5
|\| | | |/ |/|
| * libcutils: add method to get klog levelAlex Ray2014-03-072-0/+5
|/ | | | Change-Id: I55e8311bae97703be26e57b415a8ab0a6d9b4361
* Merge "adb: fix windows build after "forward --list" fix."JP Abgrall2014-03-071-1/+1
|\
| * adb: fix windows build after "forward --list" fix.JP Abgrall2014-03-061-1/+1
|/ | | | | | | | | | EWOULDBLOCK is not there on windows. It gets translated by the adb_write() wrapper into EGAIN. But the Linux one does not translate EWOULDBLOCK into EGAIN. Without EWOULDBLOCK, it works just fine. Change-Id: Ic293be392aa4364637428ea94ef87890ffa09b9b Signed-off-by: JP Abgrall <jpa@google.com>
* Merge "Fix adb forward --list when forwarding a lot"JP Abgrall2014-03-073-19/+24
|\
| * Fix adb forward --list when forwarding a lotSnild Dolkow2014-02-213-19/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The list action had some problems with large numbers of forwards: * adb_query() limited replies to 1024 B (and the print was useless) * the reply header's length could overflow (also in other commands) * ...and the client had no way of detecting it * writex() didn't retry on EAGAIN ("Resource temporarily unavailable") This patch makes all "OKAY%04x" replies use a common function which checks the length and limits it to 0xffff. This means that the client can easily check for truncated replies. Before: forward --list starts failing at 15-30 forwards (depending on device serial and forward spec lengths). After: no problems with forward --list. Change-Id: Ie1e82c4d622f5c56e51abb26533ba17d40459914
* | Merge "logd: liblog: 64-bit issues"Mark Salyzyn2014-03-069-25/+81
|\ \
| * | logd: liblog: 64-bit issuesMark Salyzyn2014-03-059-25/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | - structure packing - move towards log_time from struct timespec - extend log_time to cover differences between log_time and struct timespec Change-Id: I106ed0b609917306d170044054b5b32645f2a295
* | | Merge "Fix the build for NEON in libpixelflinger"Colin Cross2014-03-062-1/+5
|\ \ \ | |/ / |/| |
| * | Fix the build for NEON in libpixelflingerKévin PETIT2014-03-062-1/+5
|/ / | | | | | | | | | | | | | | | | ARCH_ARM_HAVE_NEON is only ever defined to true, so test for that. For the NEON function to be used, the file has to include machine/cpu-features.h so that __ARM_HAVE_NEON is defined. Change-Id: I0db196b39c493092415859e009531fcff6fc1e8b Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | Merge "Add free to CloseArchive."Mathieu Chartier2014-03-051-7/+1
|\ \
| * | Add free to CloseArchive.Mathieu Chartier2014-03-041-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | Currently CloseArchive doesn't call free and call sites don't appear to either. I could not find any call sites which manually freed the archive by deleting the handle. This fixes several memory leaks. Change-Id: I21f187dde60fd87e6e54bde06de9e76fd0791104
* | | Merge "Use the getopt function in compliance with the standard."Colin Cross2014-03-051-1/+1
|\ \ \ | |/ / |/| |
| * | Use the getopt function in compliance with the standard.David Gumberg2014-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a simple change to the use of getopt in reboot.c, as per the standard, getopt does NOT return an EOF, it returns a -1, (this was done to remove getopt's dependence on stdio.h), and since the standard does not guarantee that EOF is -1, and the documentation tells us that getopt returns -1, in my judgement it would be best to test for -1, rather than EOF. Change-Id: I63a3bb7011eb60753eb910221bbe8ce0a71e6679 Signed-off-by: David Gumberg <davidzgumberg@gmail.com>
* | | Merge "fix: making lsof show devies and loaded .so file names correctly"Dmitriy Ivanov2014-03-041-1/+1
|\ \ \
| * | | fix: making lsof show devies and loaded .so file names correctlyDmitriy Ivanov2014-03-041-1/+1
|/ / / | | | | | | | | | Change-Id: I4b6f2e0015f8cfa18400fa4bd08460a07e29a51b
* | | Merge "set /proc/sys/net/unix/max_dgram_qlen to large value"Mark Salyzyn2014-03-044-2/+9
|\ \ \
| * | | set /proc/sys/net/unix/max_dgram_qlen to large valueMark Salyzyn2014-03-034-2/+9
|/ / / | | | | | | | | | | | | | | | | | | | | | - init: set /proc/sys/net/unix/max_dgram_qlen to 300 - libsysutils: Add listen backlog argument to startListener - logd: set listen backlog to 300 Change-Id: Id6d37d6c937ba2d221e76258d89c9516619caeec
* | | Merge "Fix the handling of CodeCache return codes in pixelflinger"Jesse Hall2014-03-031-2/+2
|\ \ \ | |/ / |/| |
| * | Fix the handling of CodeCache return codes in pixelflingerKévin PETIT2014-02-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error condition was not correctly detected: an error was reported by checking that the index returned by CodeCache::cache was non-zero. This did not work because this function can return a positive value on success. Change-Id: I1f90125ee62ab277b80da4dfb341733cd6e8e86a Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | Merge "Declare (and simplify) uid_from_user."Elliott Hughes2014-03-013-12/+41
|\ \ \
| * | | 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
* | | Merge "Switch to BSD chown (for -R, primarily)."Elliott Hughes2014-03-013-69/+354
|\ \ \