summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of ae413a71 to lmp-mr1-dev-plus-aospPaul Lawrence2014-10-0911-25/+287
|\ | | | | | | Change-Id: Icdc9306b460c116441aad21bfcf3ab549224a141
| * Merge "Enable verity on userdebug, and add disable-verity to adb" into ↵Paul Lawrence2014-10-0811-24/+286
| |\ | | | | | | | | | lmp-mr1-dev
| | * Enable verity on userdebug, and add disable-verity to adbPaul Lawrence2014-10-0811-24/+286
| | | | | | | | | | | | | | | | | | Bug: 17691572 Change-Id: I58f588f318e7952d06a41325337d946d7c007e31
* | | am af191cd1: am 6b66025f: Merge "fs_mgr: fix build breakage"Mark Salyzyn2014-10-091-0/+1
|\ \ \ | | | | | | | | | | | | | | | | * commit 'af191cd157f076ee5d99890711e2881a60d7770a': fs_mgr: fix build breakage
| * \ \ am 6b66025f: Merge "fs_mgr: fix build breakage"Mark Salyzyn2014-10-091-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '6b66025f6f3e48d182e8d6aeb989d0f39eb551e3': fs_mgr: fix build breakage
| | * \ \ Merge "fs_mgr: fix build breakage"Mark Salyzyn2014-10-091-0/+1
| | |\ \ \
| | | * | | fs_mgr: fix build breakageMark Salyzyn2014-10-081-0/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Some compilers are not as smart as other compilers Change-Id: I9d93c73bdbd2dca37373d8a42a2ed510d0559274
* | | | | am 33b33549: Merge "Make the default cgroup, the foreground cgroup." into ↵Riley Andrews2014-10-082-38/+11
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '33b335495c7b8eea4b9af13a7157cf83cd085129': Make the default cgroup, the foreground cgroup.
| * | | | Merge "Make the default cgroup, the foreground cgroup." into lmp-mr1-devRiley Andrews2014-10-082-38/+11
| |\ \ \ \
| | * | | | Make the default cgroup, the foreground cgroup.Riley Andrews2014-10-072-38/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All kernel services will now be in the same cgroup as foreground applications. This will now make kernel threads not implicitly higher priority than android foreground services. Bug 17681097 Change-Id: I28e81c7aade50428d5395df86f00ce01c1e7af02
* | | | | | am 2c05b4fe: Fix top for very large VSS.Elliott Hughes2014-10-080-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '2c05b4fe419c6fc008a51359a894f172768977ac': Fix top for very large VSS.
| * | | | | Fix top for very large VSS.Elliott Hughes2014-10-081-17/+30
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17913995 (cherry picked from commit 052d78f3346a51d78f442b3612b9a680a1778675) Change-Id: Ia657c1aa5776f947905d8b0d499d64b5cfbae50c
* | | | | am f7c287b7: am 47d24416: Merge "Fix top for very large VSS."Elliott Hughes2014-10-081-17/+30
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit 'f7c287b750a2353976fc51aa3b45b380024ae84b': Fix top for very large VSS.
| * | | | am 47d24416: Merge "Fix top for very large VSS."Elliott Hughes2014-10-081-17/+30
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '47d244165751f0fa03e63a8b7aa44b50c5f3bf88': Fix top for very large VSS.
| | * | | Merge "Fix top for very large VSS."Elliott Hughes2014-10-081-17/+30
| | |\ \ \
| | | * | | Fix top for very large VSS.Elliott Hughes2014-10-081-17/+30
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 17913995 Change-Id: Ib8359345f3194780ae50019292c2746eb21a7612
* | | | | am 525db43b: am 6f7fd395: am 3fe9adc9: Merge "Fix write past end of memory." ↵Christopher Ferris2014-10-081-9/+9
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '525db43bf5351865a0483eb7f20d171a4895788b': Fix write past end of memory.
| * | | | am 6f7fd395: am 3fe9adc9: Merge "Fix write past end of memory." into lmp-devChristopher Ferris2014-10-081-9/+9
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * commit '6f7fd39536b8d3dd7c0a5bbd9350e473e559ebff': Fix write past end of memory.
| | * | | am 3fe9adc9: Merge "Fix write past end of memory." into lmp-devChristopher Ferris2014-10-081-9/+9
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '3fe9adc932948da8993d3f812bce1875efc47c0e': Fix write past end of memory.
| | | * \ \ Merge "Fix write past end of memory." into lmp-devChristopher Ferris2014-10-071-9/+9
| | | |\ \ \
| | | | * | | Fix write past end of memory.Christopher Ferris2014-10-071-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The computed flattened size of the blob does not match the size used by the flatten function when the last cached entry size is not 4 byte aligned. Bug: 17873145 Change-Id: I9f9fc102d4bde4681ae977b6de5f263aaaf56708
* | | | | | | am af162c8b: am 63e6fe92: am 41056130: am 5a69c1db: (-s ours) DO NOT MERGE ↵Christopher Ferris2014-10-070-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore libcorkscrew unwinding. * commit 'af162c8b80269781e3602fd0b0e79611ce041f93': DO NOT MERGE Restore libcorkscrew unwinding.
| * | | | | | am 63e6fe92: am 41056130: am 5a69c1db: (-s ours) DO NOT MERGE Restore ↵Christopher Ferris2014-10-070-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libcorkscrew unwinding. * commit '63e6fe92bbfe73a3637393d0ca80856954c0d5f7': DO NOT MERGE Restore libcorkscrew unwinding.
| | * | | | | am 41056130: am 5a69c1db: (-s ours) DO NOT MERGE Restore libcorkscrew unwinding.Christopher Ferris2014-10-070-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '4105613009614ed7a6622017a592b7bd728b1345': DO NOT MERGE Restore libcorkscrew unwinding.
| | | * | | | am 5a69c1db: (-s ours) DO NOT MERGE Restore libcorkscrew unwinding.Christopher Ferris2014-10-070-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5a69c1db365323f984c6a8afd1fc035551e96d99': DO NOT MERGE Restore libcorkscrew unwinding.
| | | | * | | | DO NOT MERGE Restore libcorkscrew unwinding.Christopher Ferris2014-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15701117 Change-Id: I1d2164726b8f421d8e6741b84749fddb86b60809
* | | | | | | | am 05c32e75: am eef1c703: am bf1f5cb9: am 290efd24: (-s ours) Log stack even ↵Christopher Ferris2014-10-070-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if tombstone cannot be created. * commit '05c32e75df7ddb47c1a9a4615a5445a1bb331517': Log stack even if tombstone cannot be created.
| * | | | | | | am eef1c703: am bf1f5cb9: am 290efd24: (-s ours) Log stack even if tombstone ↵Christopher Ferris2014-10-070-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cannot be created. * commit 'eef1c7035aadf3b145e506d0e475cf3779befcb3': Log stack even if tombstone cannot be created.
| | * | | | | | am bf1f5cb9: am 290efd24: (-s ours) Log stack even if tombstone cannot be ↵Christopher Ferris2014-10-070-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | created. * commit 'bf1f5cb928bc2dc92187b85b4aa04650475a857b': Log stack even if tombstone cannot be created.
| | | * | | | | am 290efd24: (-s ours) Log stack even if tombstone cannot be created.Christopher Ferris2014-10-070-0/+0
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '290efd244d8af18811b2ef2dac8f30cc7a37e066': Log stack even if tombstone cannot be created.
| | | | * | | | Log stack even if tombstone cannot be created.Christopher Ferris2014-05-091-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14498701 (cherry picked from commit c5bb49a138a78442e7326dfb6bbf85feadf0d486) Conflicts: debuggerd/tombstone.cpp Change-Id: I888b3d683c3b880357b0b24f9204a9cca3e8f3be
* | | | | | | | am 4b0374ae: am 4c4cf467: modified AUDIO_SOURCE_FM_TUNER enum value for ↵Carson Liao2014-10-071-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FM feature * commit '4b0374ae1a97cff279f287dded14619e9579da62': modified AUDIO_SOURCE_FM_TUNER enum value for FM feature
| * | | | | | | am 4c4cf467: modified AUDIO_SOURCE_FM_TUNER enum value for FM featureCarson Liao2014-10-071-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '4c4cf467f5857e9ec4a0688d75854cc9cdaa1d4d': modified AUDIO_SOURCE_FM_TUNER enum value for FM feature
| | * | | | | | modified AUDIO_SOURCE_FM_TUNER enum value for FM featureCarson Liao2014-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Review: https://partner-android-review.git.corp.google.com/#/c/183993 Signed-off-by: Carson Liao <carson.liao@mediatek.com> Change-Id: I8d70b197bcdc710119031bcf622fee0c1b3b3aa7
* | | | | | | | am b2a5d839: am a083c857: Merge changes I7d0b85b5,I74796043Mark Salyzyn2014-10-071-1/+10
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2a5d839ec27c112ab3b0929ee4cf117a876a547': logd: LogStatistics leak logd: kill(0,0) issue
| * | | | | | | am a083c857: Merge changes I7d0b85b5,I74796043Mark Salyzyn2014-10-071-1/+10
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a083c8578a8cfa44b50e6d1159b83182aba63bcb': logd: LogStatistics leak logd: kill(0,0) issue
| | * | | | | | Merge changes I7d0b85b5,I74796043Mark Salyzyn2014-10-071-1/+10
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: logd: LogStatistics leak logd: kill(0,0) issue
| | | * | | | | | logd: LogStatistics leakMark Salyzyn2014-10-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - uid = -1 in subtract operation to match add Change-Id: I7d0b85b5334c5264fd04309cb78e0c9aec0ad261
| | | * | | | | | logd: kill(0,0) issueMark Salyzyn2014-10-061-1/+6
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Recognize pid=0 as special case (kernel or pre-init sourced) and refrain from treating it in the general case. Bug: 17526159 Change-Id: I74796043ac34753c6dd10018719ebc0bcd94e012
* | | | | | | | am 332bdffa: am 09dc0633: Merge changes I74796043,I74796043Mark Salyzyn2014-10-066-69/+97
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '332bdffa4fd2f3c12bd501cdd92c037d337f3cc7': logd: Add control statistics enable/disable. logd: cleanup
| * | | | | | | am 09dc0633: Merge changes I74796043,I74796043Mark Salyzyn2014-10-066-69/+97
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '09dc063319d017625fbde0fd380ed677b680415e': logd: Add control statistics enable/disable. logd: cleanup
| | * | | | | | Merge changes I74796043,I74796043Mark Salyzyn2014-10-066-69/+97
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: logd: Add control statistics enable/disable. logd: cleanup
| | | * | | | | | logd: Add control statistics enable/disable.Mark Salyzyn2014-10-065-14/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - ro.build.type=user turn off statistics - ro.config.low_ram=true turn off statistics - logd.statistics override Bug: 17526159 Bug: 17526187 Change-Id: I74796043ac34753c6dd10018719ebc0bcd94e00f
| | | * | | | | | logd: cleanupMark Salyzyn2014-10-064-56/+56
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - simplify access and control exposure to class list - indent - compile warning - Follow standard naming convention for variables and methods - merge common fragments - Side Effects: none Change-Id: I74796043ac34753c6dd10018719ebc0bcd94e010
* | | | | | | | am ad0ff1d9: am 4fceda2b: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-065-0/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ad0ff1d99cd00ce53f667b27e53f44e802315a36': Add -no-integrated-as at local level.
| * | | | | | | am 4fceda2b: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-065-0/+18
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '4fceda2b53dd2b7537bb65cb6ee0d61bee5ab66c': Add -no-integrated-as at local level.
| | * | | | | | Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-065-0/+18
| | |\ \ \ \ \ \
| | | * | | | | | Add -no-integrated-as at local level.Chih-Hung Hsieh2014-10-065-0/+18
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Later we will enable integrated-as as default at the global level. BUG: 17820427 Change-Id: I1beed3e75d074d970fa9112ec1c0f0df3d43947a
* | | | | | | | am 67479c97: am 24e3e831: am 7569b7b3: Merge "Add bootanimation to audio ↵Mike Lockwood2014-10-061-1/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | group so it can play boot sound" into lmp-dev * commit '67479c9771d2ce1b39fe5d074fac9f40a220f231': Add bootanimation to audio group so it can play boot sound
| * | | | | | | am 24e3e831: am 7569b7b3: Merge "Add bootanimation to audio group so it can ↵Mike Lockwood2014-10-061-1/+1
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | play boot sound" into lmp-dev * commit '24e3e831199e1279b3a12b0ccfeb00e06d4f4fd5': Add bootanimation to audio group so it can play boot sound
generated by cgit v1.1 at 2025-02-10 19:11:03 +0000