summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am c9fc3db5: am 7746546b: Merge "logcat: build regression"Mark Salyzyn2015-04-131-6/+4
|\ | | | | | | | | * commit 'c9fc3db55b6a54dde740ba558a98835ea6552190': logcat: build regression
| * am 7746546b: Merge "logcat: build regression"Mark Salyzyn2015-04-131-6/+4
| |\ | | | | | | | | | | | | * commit '7746546b89bf2da44eb058a4053dd4505d00d824': logcat: build regression
| | * Merge "logcat: build regression"Mark Salyzyn2015-04-131-6/+4
| | |\
| | | * logcat: build regressionMark Salyzyn2015-04-131-6/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | printflike checks for NULL fmt at compile time, checks for NULL at runtime are optimized out. Regression as a result of commit 5976303aa6e55a9e81eadb35d50f458052e3fa24. Change-Id: Ia4e7ee4b6cb2adf1e6609c70e79684855f76e6fc
* | | am 7249f69a: am b9a41bdb: Merge "logcat: Minor fixes"Mark Salyzyn2015-04-131-133/+153
|\ \ \ | |/ / | | | | | | | | | * commit '7249f69a987fd21b6903d01ed372dc355a0163ea': logcat: Minor fixes
| * | am b9a41bdb: Merge "logcat: Minor fixes"Mark Salyzyn2015-04-131-133/+153
| |\ \ | | |/ | | | | | | | | | * commit 'b9a41bdb079932d2ce119b4c8e6615531a6471e0': logcat: Minor fixes
| | * Merge "logcat: Minor fixes"Mark Salyzyn2015-04-131-133/+153
| | |\
| | | * logcat: Minor fixesTraian Schiau2015-04-111-133/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove -r default value implementation (since is not functional). Check the status of some memory allocations. Make sure that the pruning buffer is set to NULL if we get to the end of the loop. Make sure that the file status is successfully retrieved before using the size. Add strtouia - string to unsigned argument. Add logcat_panic with/without printing an error message and help. Play nicer with the android namespace. Change-Id: Id4c37cf64968128424e29bf1725f6c9a5924a0e2 Signed-off-by: Traian Schiau <traianx.schiau@intel.com>
* | | | am 3c5e3a82: am 8913dec5: Merge changes Iddd45a67,Ifdc20b09,Ibc68480dMark Salyzyn2015-04-138-41/+268
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * commit '3c5e3a8251615c857804d4f39e54d1ee263983f9': logd: disable worst uid prune for events buffer Revert: "logd: default off by-UID spam filter" logd: annotate worst-UID pruned entries
| * | | am 8913dec5: Merge changes Iddd45a67,Ifdc20b09,Ibc68480dMark Salyzyn2015-04-138-41/+268
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | * commit '8913dec51d33f93e8e96fdd12c8112c5cc7dbb78': logd: disable worst uid prune for events buffer Revert: "logd: default off by-UID spam filter" logd: annotate worst-UID pruned entries
| | * | Merge changes Iddd45a67,Ifdc20b09,Ibc68480dMark Salyzyn2015-04-138-41/+268
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: logd: disable worst uid prune for events buffer Revert: "logd: default off by-UID spam filter" logd: annotate worst-UID pruned entries
| | | * | logd: disable worst uid prune for events bufferMark Salyzyn2015-04-103-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is some usage statistics that would be hurt by pruning by UID, since _all_ usage statistics come from system_server. In other words we expect it to be chatty. Until we formulate and evaluate a better (eg: per-tag?) filtration mechanism, lets hold off pruning by UID. Bug: 19608965 Change-Id: Iddd45a671e13bdcf3394c20919ad1f2e4ef36616
| | | * | Revert: "logd: default off by-UID spam filter"Mark Salyzyn2015-04-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With "logd: inject first UID by log buffer message" we can remove the FUD introduced by having the UID spam filter on This reverts commit 4141cb2391cfd7211ffff7e53841c6c52869d525 Bug: 19608965 Bug: 14469172 Change-Id: Ifdc20b099e0e426546525b11c1dfe8cc0f830a02
| | | * | logd: annotate worst-UID pruned entriesMark Salyzyn2015-04-108-38/+261
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - internal dropped entries are associated by prune by worst UID and are applied by UID and by PID - track dropped entries by rewriting them in place - merge similar dropped entries together for same UID(implied), PID and TID so that blame can more clearly be placed - allow aging of dropped entries by the general backgound pruning - report individual dropped entries formatted to reader - add statistics to track dropped entries by UID, the combination of statistics and dropped logging can track over-the-top Chattiest clients. Bug: 19608965 Change-Id: Ibc68480df0c69c55703270cd70c6b26aea165853
* | | | am 532d0a11: am 9b83b623: Merge "Executable to run on boot that removes old ↵Neil Fuller2015-04-133-0/+260
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | tzdata if needed" * commit '532d0a11c439b101ac2d26f6fdc44f9791f6d0ad': Executable to run on boot that removes old tzdata if needed
| * | | am 9b83b623: Merge "Executable to run on boot that removes old tzdata if needed"Neil Fuller2015-04-133-0/+260
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '9b83b62305634b49e67f53a73eda14cea480029e': Executable to run on boot that removes old tzdata if needed
| | * | Merge "Executable to run on boot that removes old tzdata if needed"Neil Fuller2015-04-133-0/+260
| | |\ \ | | | |/ | | |/|
| | | * Executable to run on boot that removes old tzdata if neededNeil Fuller2015-04-133-0/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tzdatacheck is exec'd from init.rc early in boot just after /data is mounted. It checks to make sure that the tz rule data in /data is newer than the version in /system. If the data is older it is deleted. This is to address problems with earlier tz rule updates that occurred: after an OTA upgrade previous updates in /data would override newer versions in the system partition. Includes change to init.rc neccessary to run it at boot time. Other changes are in external/selinux. Bug: 19941636 Bug: https://code.google.com/p/android/issues/detail?id=35730 Change-Id: I7cc61e058424c856da88f11ff9b259f34cb39dc7
* | | | am 1110aa78: am 65937e9b: Merge "Prevent unaligned read in libziparchive."Dan Albert2015-04-102-22/+21
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '1110aa782620717b515f8122b4a43539763681f7': Prevent unaligned read in libziparchive.
| * | | am 65937e9b: Merge "Prevent unaligned read in libziparchive."Dan Albert2015-04-102-22/+21
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '65937e9bac665e216268d7341094afcaa52ef8c1': Prevent unaligned read in libziparchive.
| | * | Merge "Prevent unaligned read in libziparchive."Dan Albert2015-04-102-22/+21
| | |\ \
| | | * | Prevent unaligned read in libziparchive.Dan Albert2015-04-092-22/+21
| | | | | | | | | | | | | | | | | | | | Change-Id: I4afc3729a1b2c06a6621cb8c9742fc94b5a665f5
* | | | | am 8f6dfc7d: am e65c2210: Merge "log: Add check for LINT_RLOG"Mark Salyzyn2015-04-101-4/+23
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '8f6dfc7d903e7cf88b992bd8d60f51ec9150555c': log: Add check for LINT_RLOG
| * | | | am e65c2210: Merge "log: Add check for LINT_RLOG"Mark Salyzyn2015-04-101-4/+23
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'e65c2210d045044328bbac957c5cedf6838a0b2c': log: Add check for LINT_RLOG
| | * | | Merge "log: Add check for LINT_RLOG"Mark Salyzyn2015-04-101-4/+23
| | |\ \ \
| | | * | | log: Add check for LINT_RLOGMark Salyzyn2015-04-101-4/+23
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to make it easier to find radio system logging mistakes, if LINT_RLOG is defined we will remove all the definitions for ALOG* and SLOG*, as well as the log ids to introduce compile and link errors. Bug: 20143912 Change-Id: I1511bdce75213f3a5bacdbc4f2ab315aa1fa56fc
* | | | | am 486b8de7: am 03a03401: Merge "Add base/memory.h."Dan Albert2015-04-101-0/+47
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '486b8de7e0a101f7c99f7fd7a92a4562e7745967': Add base/memory.h.
| * | | | am 03a03401: Merge "Add base/memory.h."Dan Albert2015-04-101-0/+47
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '03a034010ee73e490766cd865f2c12126af63774': Add base/memory.h.
| | * | | Merge "Add base/memory.h."Dan Albert2015-04-101-0/+47
| | |\ \ \ | | | |/ /
| | | * | Add base/memory.h.Dan Albert2015-04-091-0/+47
| | |/ / | | | | | | | | | | | | | | | | | | | | Right now this only includes an API for unaligned reads/writes. Change-Id: Ieb42498aa17cbd1035b66c51bd1c4f16fa2acfdb
* | | | am 7a91e93e: am be940153: Merge "Revert "Revert "fs_mgr_verity: Add support ↵Mohamad Ayyash2015-04-093-27/+55
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | for squashfs""" * commit '7a91e93e8cc2dd9910513c6bcc9380b4c7cf8e0e': Revert "Revert "fs_mgr_verity: Add support for squashfs""
| * | | am be940153: Merge "Revert "Revert "fs_mgr_verity: Add support for squashfs"""Mohamad Ayyash2015-04-093-27/+55
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'be940153816b28cf1cb68f7f135c77f5f1585fe1': Revert "Revert "fs_mgr_verity: Add support for squashfs""
| | * | Merge "Revert "Revert "fs_mgr_verity: Add support for squashfs"""Mohamad Ayyash2015-04-093-27/+55
| | |\ \ | | | |/ | | |/|
| | | * Revert "Revert "fs_mgr_verity: Add support for squashfs""Mohamad Ayyash2015-04-083-27/+55
| | |/ | | | | | | | | | | | | | | | This reverts commit 7b97c7a3fa0f1bdae5b45a70f625ff48f9dab0c1. Change-Id: Id47e70479fe9247b7936f2e54d4dbfbb4f63f635
* | | am 5dd81c93: am d67ff2d5: Merge "Move ls implementation detail into ls."Elliott Hughes2015-04-094-196/+107
|\ \ \ | |/ / | | | | | | | | | * commit '5dd81c936eada0ad0be2e9857d726d2e3ab17e30': Move ls implementation detail into ls.
| * | am d67ff2d5: Merge "Move ls implementation detail into ls."Elliott Hughes2015-04-094-196/+107
| |\ \ | | |/ | | | | | | | | | * commit 'd67ff2d507add84a4d958bc19657e88d4689b92d': Move ls implementation detail into ls.
| | * Merge "Move ls implementation detail into ls."Elliott Hughes2015-04-094-196/+107
| | |\
| | | * Move ls implementation detail into ls.Elliott Hughes2015-04-084-196/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove the unused generality, and remove a dependency on a linux/ header file when there's a sys/ one that's even better. Change-Id: If07608cc9ae2b7c2928ee2a9e33d20d63a9a8f45
* | | | am 463913e6: am e74baca6: Merge "logd: Build Breakage"Mark Salyzyn2015-04-091-2/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '463913e682aff2a427ecb29ad6ac71c6391848ae': logd: Build Breakage
| * | | am e74baca6: Merge "logd: Build Breakage"Mark Salyzyn2015-04-091-2/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'e74baca6f317ea54cb08c310eba86b5e6f6e73de': logd: Build Breakage
| | * | Merge "logd: Build Breakage"Mark Salyzyn2015-04-081-2/+1
| | |\ \
| | | * | logd: Build BreakageMark Salyzyn2015-04-081-2/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | a change slipped in from a rebase conflict, repairing. Change-Id: Ib6479f88fb044f37b6721035c2f7cc75577c0411
* | | | am 45b83835: am 82d11859: Merge "logd: uidToName improvement"Mark Salyzyn2015-04-093-3/+69
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '45b8383598da345460a1f8f065190b8b46bc13df': logd: uidToName improvement
| * | | am 82d11859: Merge "logd: uidToName improvement"Mark Salyzyn2015-04-083-3/+69
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '82d11859ef7cc00373760b581b9491c5fc04b6d4': logd: uidToName improvement
| | * | Merge "logd: uidToName improvement"Mark Salyzyn2015-04-083-3/+69
| | |\ \
| | | * | logd: uidToName improvementMark Salyzyn2015-04-083-3/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - read packages.list to acquire package names - hijack the reinit handler as a privileged worker Bug: 19608965 Change-Id: If7becb34354d6415e5c387ecea7d4109a15259c9
* | | | | am d8ff56c9: am c3d40b86: Merge "logd: Add Pid statistics"Mark Salyzyn2015-04-093-58/+248
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'd8ff56c9f1550bc2d25807b855d364ef19cd5d03': logd: Add Pid statistics
| * | | | am c3d40b86: Merge "logd: Add Pid statistics"Mark Salyzyn2015-04-083-58/+248
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'c3d40b86911867439fc01829d4f1011dae2a31be': logd: Add Pid statistics
| | * | | Merge "logd: Add Pid statistics"Mark Salyzyn2015-04-083-58/+248
| | |\ \ \ | | | |/ /
| | | * | logd: Add Pid statisticsMark Salyzyn2015-04-083-58/+248
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Optional class of statistics for PID - Enhance pidToName - Enhanced uidToName - Enhance pidToUid - template sort and iteration Bug: 19608965 Change-Id: I04a1f02e9851b62987f9b176908134e455f22d1d