summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of 6e9b28b2 to masterElliott Hughes2015-04-151-4/+4
|\ | | | | | | Change-Id: Icd1bbc33283c504691934256a4cf5989868d3caf
| * am fae77740: am f65d9756: Merge "Move away from gr_surface."Elliott Hughes2015-04-151-4/+4
| |\ | | | | | | | | | | | | * commit 'fae77740c29b732e82b73a043f596470cd0ac0ed': Move away from gr_surface.
| | * am f65d9756: Merge "Move away from gr_surface."Elliott Hughes2015-04-151-4/+4
| | |\ | | | | | | | | | | | | | | | | * commit 'f65d97567c0d857458a1978085af4518750f51b6': Move away from gr_surface.
| | | * Merge "Move away from gr_surface."Elliott Hughes2015-04-151-4/+4
| | | |\
| | | | * Move away from gr_surface.Elliott Hughes2015-04-151-4/+4
| | | |/ | | | | | | | | | | | | Change-Id: Icfa81b18e5c99e3ffc5c55aba1d435eb26eb8680
* | | | am 687dae83: am 437a328a: am 56c6575d: Merge "logd: syscall optimization"Mark Salyzyn2015-04-156-7/+21
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '687dae83da7da2a0efe8263281f9ba898a610a41': logd: syscall optimization
| * | | am 437a328a: am 56c6575d: Merge "logd: syscall optimization"Mark Salyzyn2015-04-156-7/+21
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '437a328a14ee07b8da434964eb13f640302c0302': logd: syscall optimization
| | * | am 56c6575d: Merge "logd: syscall optimization"Mark Salyzyn2015-04-156-7/+21
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '56c6575da72653c3ffd79baf1b431574d6f7e1ea': logd: syscall optimization
| | | * Merge "logd: syscall optimization"Mark Salyzyn2015-04-156-7/+21
| | | |\
| | | | * logd: syscall optimizationMark Salyzyn2015-04-016-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - prset(PR_SET_NAME) call once - No need to call getuid(), should be AID_LOGD Change-Id: I4dde0b178bc84e711b355cd7677b0dbf905a0634
* | | | | am 5966e7e5: am 03e590a7: am 7369d314: Merge "Fix alignment when reading ↵Yabin Cui2015-04-141-2/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | note segment." * commit '5966e7e5f4a7d79986dbea3415f29a595b259877': Fix alignment when reading note segment.
| * | | | am 03e590a7: am 7369d314: Merge "Fix alignment when reading note segment."Yabin Cui2015-04-141-2/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '03e590a7285111b2f8ef25dac74e50a543ed8010': Fix alignment when reading note segment.
| | * | | am 7369d314: Merge "Fix alignment when reading note segment."Yabin Cui2015-04-141-2/+4
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '7369d314d255afc1df5f7cf343785cc942042852': Fix alignment when reading note segment.
| | | * | Merge "Fix alignment when reading note segment."Yabin Cui2015-04-141-2/+4
| | | |\ \
| | | | * | Fix alignment when reading note segment.Yabin Cui2015-04-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ELF said that padding is present, if necessary, to ensure 4-byte alignment for the descriptor and next note entry, but such padding is not included in namesz and descsz. Change-Id: I7896783f3d9a787772d56c49905f52a493c9fba1
* | | | | | am d65b1281: am 9c328e67: am 35d09b69: Merge "logd: pidToUid incorrect"Mark Salyzyn2015-04-141-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'd65b1281f43660b9405d050ccfddb946fc6e10a2': logd: pidToUid incorrect
| * | | | | am 9c328e67: am 35d09b69: Merge "logd: pidToUid incorrect"Mark Salyzyn2015-04-141-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '9c328e67c0eb64f7d73dd5b537950c02b62bd77c': logd: pidToUid incorrect
| | * | | | am 35d09b69: Merge "logd: pidToUid incorrect"Mark Salyzyn2015-04-141-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '35d09b6928d77d619d95d87f6fe16eaedc99a954': logd: pidToUid incorrect
| | | * | | Merge "logd: pidToUid incorrect"Mark Salyzyn2015-04-141-1/+1
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | logd: pidToUid incorrectMark Salyzyn2015-04-141-1/+1
| | | |/ / | | | | | | | | | | | | | | | Change-Id: I9b0e655780924db125568179771e57b01e80aaae
* | | | | resolved conflicts for merge of d0b6de41 to masterEd Tam2015-04-1310-9/+177
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I1d1f6b1cdbd7ee441682c4258a11fb3198ca7d94
| * | | | Merge "resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aosp" ↵Ed Tam2015-04-1310-9/+177
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into lmp-mr1-dev-plus-aosp
| | * \ \ \ resolved conflicts for merge of 79f33846 to lmp-mr1-dev-plus-aospEd Tam2015-04-1310-9/+177
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I24c60a2747931917a3ea09b953905ce0f4145280
| | | * | | | fs_mgr: introduce fs_mgr_format to format wiped partitionsChris Fries2015-04-1010-7/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move fastboot's format logic into fs_mgr, to consolidate the knowledge about how to do this (and when to wipe metadata). Try to format these formattable paritions if they are wiped. If formatting fails, we will fall out to let recovery mode handle it. Bug: 20082763 Change-Id: I397cc197550e78d932e8a154fd234695c46dbe7b
* | | | | | | am 17b6a39f: am af59eec7: am e83d8a69: Merge "Fix memory leak in parse_action"Tom Cherry2015-04-131-0/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '17b6a39f04c291c6002a22ec60eecdea51f86170': Fix memory leak in parse_action
| * | | | | | am af59eec7: am e83d8a69: Merge "Fix memory leak in parse_action"Tom Cherry2015-04-131-0/+7
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | | * commit 'af59eec776860514a70443dd94a1bcd130ed0ced': Fix memory leak in parse_action
| | * | | | am e83d8a69: Merge "Fix memory leak in parse_action"Tom Cherry2015-04-131-0/+7
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | * commit 'e83d8a6900ee53942e5939656c3b6ae177d1f1d2': Fix memory leak in parse_action
| | | * | | Merge "Fix memory leak in parse_action"Tom Cherry2015-04-131-0/+7
| | | |\ \ \
| | | | * | | Fix memory leak in parse_actionTom Cherry2015-04-131-0/+7
| | | |/ / / | | | | | | | | | | | | | | | | | | Change-Id: I3ed1da5674ae0b4ac50c1925e4f63af7f1748483
* | | | | | am 51c6ad17: am c9fc3db5: am 7746546b: Merge "logcat: build regression"Mark Salyzyn2015-04-131-6/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '51c6ad178e723a4cd59a143dd48d81ccdce2d489': logcat: build regression
| * | | | | 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
* | | | | | Merge "Use proper NO_ERROR checking KS return value"Andres Morales2015-04-131-2/+4
|\ \ \ \ \ \
| * | | | | | Use proper NO_ERROR checking KS return valueAndres Morales2015-04-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's a bit weird that KS defines NO_ERROR outside a namespace like the Android binder lib, but assigns it the value 1 instead of 0. Change-Id: I5aedfd495f2f3bdff7eb1b4ba0f75d335dfe12d9
* | | | | | | am a4be1b72: am 7249f69a: am b9a41bdb: Merge "logcat: Minor fixes"Mark Salyzyn2015-04-131-133/+153
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'a4be1b72b9b0778274fe70c9c37b9e29f9062eb5': logcat: Minor fixes
| * | | | | | 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 8bd044fc: am 3c5e3a82: am 8913dec5: Merge changes ↵Mark Salyzyn2015-04-138-41/+268
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Iddd45a67,Ifdc20b09,Ibc68480d * commit '8bd044fc8b83eba235b50495b91e98ea2e0ffe7a': logd: disable worst uid prune for events buffer Revert: "logd: default off by-UID spam filter" logd: annotate worst-UID pruned entries
| * | | | | | | 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 90014d61: am 532d0a11: am 9b83b623: Merge "Executable to run on boot that ↵Neil Fuller2015-04-133-0/+260
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | removes old tzdata if needed" * commit '90014d61c83ef5105881c171481a50f21fd4dd57': Executable to run on boot that removes old tzdata if needed
| * | | | | | 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
generated by cgit v1.1 at 2024-12-23 17:39:09 +0000