Elliott Hughes
5c9d4227fe
am f7c287b7: am 47d24416: Merge "Fix top for very large VSS."
...
* commit 'f7c287b750a2353976fc51aa3b45b380024ae84b':
Fix top for very large VSS.
2014-10-08 18:29:57 +00:00
Elliott Hughes
f7c287b750
am 47d24416: Merge "Fix top for very large VSS."
...
* commit '47d244165751f0fa03e63a8b7aa44b50c5f3bf88':
Fix top for very large VSS.
2014-10-08 18:24:13 +00:00
Elliott Hughes
47d2441657
Merge "Fix top for very large VSS."
2014-10-08 18:20:31 +00:00
Elliott Hughes
052d78f334
Fix top for very large VSS.
...
Bug: 17913995
Change-Id: Ib8359345f3194780ae50019292c2746eb21a7612
2014-10-08 11:20:03 -07:00
Christopher Ferris
8525ab83fb
am 525db43b: am 6f7fd395: am 3fe9adc9: Merge "Fix write past end of memory." into lmp-dev
...
* commit '525db43bf5351865a0483eb7f20d171a4895788b':
Fix write past end of memory.
2014-10-08 07:52:00 +00:00
Christopher Ferris
525db43bf5
am 6f7fd395: am 3fe9adc9: Merge "Fix write past end of memory." into lmp-dev
...
* commit '6f7fd39536b8d3dd7c0a5bbd9350e473e559ebff':
Fix write past end of memory.
2014-10-08 05:24:51 +00:00
Christopher Ferris
6f7fd39536
am 3fe9adc9: Merge "Fix write past end of memory." into lmp-dev
...
* commit '3fe9adc932948da8993d3f812bce1875efc47c0e':
Fix write past end of memory.
2014-10-08 05:12:00 +00:00
Christopher Ferris
3fe9adc932
Merge "Fix write past end of memory." into lmp-dev
2014-10-07 23:19:40 +00:00
Christopher Ferris
de722e56df
Fix write past end of memory.
...
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
2014-10-07 14:52:31 -07:00
Christopher Ferris
c611e19c60
am af162c8b: am 63e6fe92: am 41056130: am 5a69c1db: (-s ours) DO NOT MERGE Restore libcorkscrew unwinding.
...
* commit 'af162c8b80269781e3602fd0b0e79611ce041f93':
DO NOT MERGE Restore libcorkscrew unwinding.
2014-10-07 17:54:13 +00:00
Christopher Ferris
5abc428a36
am 05c32e75: am eef1c703: am bf1f5cb9: am 290efd24: (-s ours) Log stack even if tombstone cannot be created.
...
* commit '05c32e75df7ddb47c1a9a4615a5445a1bb331517':
Log stack even if tombstone cannot be created.
2014-10-07 17:54:12 +00:00
Christopher Ferris
af162c8b80
am 63e6fe92: am 41056130: am 5a69c1db: (-s ours) DO NOT MERGE Restore libcorkscrew unwinding.
...
* commit '63e6fe92bbfe73a3637393d0ca80856954c0d5f7':
DO NOT MERGE Restore libcorkscrew unwinding.
2014-10-07 17:42:40 +00:00
Christopher Ferris
05c32e75df
am eef1c703: am bf1f5cb9: am 290efd24: (-s ours) Log stack even if tombstone cannot be created.
...
* commit 'eef1c7035aadf3b145e506d0e475cf3779befcb3':
Log stack even if tombstone cannot be created.
2014-10-07 17:42:40 +00:00
Christopher Ferris
63e6fe92bb
am 41056130: am 5a69c1db: (-s ours) DO NOT MERGE Restore libcorkscrew unwinding.
...
* commit '4105613009614ed7a6622017a592b7bd728b1345':
DO NOT MERGE Restore libcorkscrew unwinding.
2014-10-07 17:31:45 +00:00
Christopher Ferris
eef1c7035a
am bf1f5cb9: am 290efd24: (-s ours) Log stack even if tombstone cannot be created.
...
* commit 'bf1f5cb928bc2dc92187b85b4aa04650475a857b':
Log stack even if tombstone cannot be created.
2014-10-07 17:31:44 +00:00
Carson Liao
519d1cf44a
am 4b0374ae: am 4c4cf467: modified AUDIO_SOURCE_FM_TUNER enum value for FM feature
...
* commit '4b0374ae1a97cff279f287dded14619e9579da62':
modified AUDIO_SOURCE_FM_TUNER enum value for FM feature
2014-10-07 17:06:04 +00:00
Carson Liao
4b0374ae1a
am 4c4cf467: modified AUDIO_SOURCE_FM_TUNER enum value for FM feature
...
* commit '4c4cf467f5857e9ec4a0688d75854cc9cdaa1d4d':
modified AUDIO_SOURCE_FM_TUNER enum value for FM feature
2014-10-07 16:57:35 +00:00
Christopher Ferris
4105613009
am 5a69c1db: (-s ours) DO NOT MERGE Restore libcorkscrew unwinding.
...
* commit '5a69c1db365323f984c6a8afd1fc035551e96d99':
DO NOT MERGE Restore libcorkscrew unwinding.
2014-10-07 15:27:35 +00:00
Christopher Ferris
bf1f5cb928
am 290efd24: (-s ours) Log stack even if tombstone cannot be created.
...
* commit '290efd244d8af18811b2ef2dac8f30cc7a37e066':
Log stack even if tombstone cannot be created.
2014-10-07 15:27:34 +00:00
Mark Salyzyn
396d11e3c5
am b2a5d839: am a083c857: Merge changes I7d0b85b5,I74796043
...
* commit 'b2a5d839ec27c112ab3b0929ee4cf117a876a547':
logd: LogStatistics leak
logd: kill(0,0) issue
2014-10-07 14:31:34 +00:00
Mark Salyzyn
b2a5d839ec
am a083c857: Merge changes I7d0b85b5,I74796043
...
* commit 'a083c8578a8cfa44b50e6d1159b83182aba63bcb':
logd: LogStatistics leak
logd: kill(0,0) issue
2014-10-07 14:27:06 +00:00
Mark Salyzyn
a083c8578a
Merge changes I7d0b85b5,I74796043
...
* changes:
logd: LogStatistics leak
logd: kill(0,0) issue
2014-10-07 14:23:46 +00:00
Carson Liao
4c4cf467f5
modified AUDIO_SOURCE_FM_TUNER enum value for FM feature
...
Review: https://partner-android-review.git.corp.google.com/#/c/183993
Signed-off-by: Carson Liao <carson.liao@mediatek.com>
Change-Id: I8d70b197bcdc710119031bcf622fee0c1b3b3aa7
2014-10-06 22:02:37 -07:00
Mark Salyzyn
4a774356ca
am 332bdffa: am 09dc0633: Merge changes I74796043,I74796043
...
* commit '332bdffa4fd2f3c12bd501cdd92c037d337f3cc7':
logd: Add control statistics enable/disable.
logd: cleanup
2014-10-06 23:10:29 +00:00
Mark Salyzyn
332bdffa4f
am 09dc0633: Merge changes I74796043,I74796043
...
* commit '09dc063319d017625fbde0fd380ed677b680415e':
logd: Add control statistics enable/disable.
logd: cleanup
2014-10-06 23:06:50 +00:00
Mark Salyzyn
f48ea7c8dc
logd: LogStatistics leak
...
- uid = -1 in subtract operation to match add
Change-Id: I7d0b85b5334c5264fd04309cb78e0c9aec0ad261
2014-10-06 22:43:56 +00:00
Mark Salyzyn
df5aa61f05
logd: kill(0,0) issue
...
- 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
2014-10-06 22:43:46 +00:00
Mark Salyzyn
09dc063319
Merge changes I74796043,I74796043
...
* changes:
logd: Add control statistics enable/disable.
logd: cleanup
2014-10-06 22:43:26 +00:00
Mark Salyzyn
f5fc509589
logd: Add control statistics enable/disable.
...
- 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
2014-10-06 22:42:47 +00:00
Mark Salyzyn
e72c6e4366
logd: cleanup
...
- 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
2014-10-06 22:42:07 +00:00
Chih-Hung Hsieh
2aaccfe590
am ad0ff1d9: am 4fceda2b: Merge "Add -no-integrated-as at local level."
...
* commit 'ad0ff1d99cd00ce53f667b27e53f44e802315a36':
Add -no-integrated-as at local level.
2014-10-06 22:37:06 +00:00
Chih-Hung Hsieh
ad0ff1d99c
am 4fceda2b: Merge "Add -no-integrated-as at local level."
...
* commit '4fceda2b53dd2b7537bb65cb6ee0d61bee5ab66c':
Add -no-integrated-as at local level.
2014-10-06 22:31:26 +00:00
Chih-Hung Hsieh
4fceda2b53
Merge "Add -no-integrated-as at local level."
2014-10-06 22:02:06 +00:00
Chih-Hung Hsieh
60c57dad4e
Add -no-integrated-as at local level.
...
Later we will enable integrated-as as default at the global level.
BUG: 17820427
Change-Id: I1beed3e75d074d970fa9112ec1c0f0df3d43947a
2014-10-06 13:33:25 -07:00
Mike Lockwood
6ee5d62ac0
am 67479c97: am 24e3e831: am 7569b7b3: Merge "Add bootanimation to audio group so it can play boot sound" into lmp-dev
...
* commit '67479c9771d2ce1b39fe5d074fac9f40a220f231':
Add bootanimation to audio group so it can play boot sound
2014-10-06 19:44:18 +00:00
Mike Lockwood
67479c9771
am 24e3e831: am 7569b7b3: Merge "Add bootanimation to audio group so it can play boot sound" into lmp-dev
...
* commit '24e3e831199e1279b3a12b0ccfeb00e06d4f4fd5':
Add bootanimation to audio group so it can play boot sound
2014-10-06 19:28:40 +00:00
Mike Lockwood
24e3e83119
am 7569b7b3: Merge "Add bootanimation to audio group so it can play boot sound" into lmp-dev
...
* commit '7569b7b39f4f12cc4e87525113c82dae65c0b250':
Add bootanimation to audio group so it can play boot sound
2014-10-06 19:17:05 +00:00
Mike Lockwood
7569b7b39f
Merge "Add bootanimation to audio group so it can play boot sound" into lmp-dev
2014-10-06 18:40:46 +00:00
Elliott Hughes
ddf510d478
am 85cac2ab: am b1dd4af7: Merge "Fix a typo in ioctl usage message."
...
* commit '85cac2abd416120646b0fe058aac812ca517d71b':
Fix a typo in ioctl usage message.
2014-10-06 17:20:55 +00:00
Elliott Hughes
85cac2abd4
am b1dd4af7: Merge "Fix a typo in ioctl usage message."
...
* commit 'b1dd4af7c41dc0d73f9431ec7adabc342e13434e':
Fix a typo in ioctl usage message.
2014-10-06 17:16:04 +00:00
Elliott Hughes
b1dd4af7c4
Merge "Fix a typo in ioctl usage message."
2014-10-06 17:12:01 +00:00
Elliott Hughes
a0d61ba3e9
Fix a typo in ioctl usage message.
...
Change-Id: I850dd9995a8ad6cb1f606cca2f57d7dbba2f40ed
2014-10-06 10:09:25 -07:00
Hans Boehm
054627df6b
am 072877af: am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""
...
* commit '072877af485d49f11e227c0d22a7bb4a341533d6':
Revert "Rewrite atomic.h to use stdatomic.h."
2014-10-04 02:09:19 +00:00
Hans Boehm
072877af48
am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""
...
* commit '41198eea42b7a6f1d4222abd7a5fec965d11b238':
Revert "Rewrite atomic.h to use stdatomic.h."
2014-10-04 01:36:18 +00:00
Hans Boehm
41198eea42
Merge "Revert "Rewrite atomic.h to use stdatomic.h.""
2014-10-04 01:31:49 +00:00
Hans Boehm
2789faabfa
Revert "Rewrite atomic.h to use stdatomic.h."
...
This reverts commit cb344d4640 .
Change-Id: Ib17cd8d00695062177ce863cedc4ec7148012317
2014-10-04 00:49:06 +00:00
Hans Boehm
2ac8207e50
am f5204549: am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."
...
* commit 'f5204549faf7310cc808bcb3676fb36268178e26':
Rewrite atomic.h to use stdatomic.h.
2014-10-04 00:06:30 +00:00
Hans Boehm
f5204549fa
am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."
...
* commit '028928fe3ca42b7aab55cb49f2784caeec025a12':
Rewrite atomic.h to use stdatomic.h.
2014-10-03 23:59:04 +00:00
Hans Boehm
028928fe3c
Merge "Rewrite atomic.h to use stdatomic.h."
2014-10-03 23:47:36 +00:00
Calin Juravle
d8e138396a
am 2124b521: am c6083626: Merge "Use initUnchangeableSystemProperty for initializing os.arch."
...
* commit '2124b521e86ee778880eb42cd40c5820d625890e':
Use initUnchangeableSystemProperty for initializing os.arch.
2014-10-03 11:03:39 +00:00