Eric Laurent
ca4018dde5
am 4c58d894: am 62e05407: am f6cce347: audio: add HW hotword capture flag
...
* commit '4c58d8945281fa2a41e36b4ed3b93fdcf56c1bb4':
audio: add HW hotword capture flag
2014-09-24 17:17:07 +00:00
Eric Laurent
4c58d89452
am 62e05407: am f6cce347: audio: add HW hotword capture flag
...
* commit '62e05407da5c36b6c4057e613ae6d4e3068a3721':
audio: add HW hotword capture flag
2014-09-24 04:19:16 +00:00
Eric Laurent
62e05407da
am f6cce347: audio: add HW hotword capture flag
...
* commit 'f6cce347a73e3b3da9ff6698ead25b5a543ce47b':
audio: add HW hotword capture flag
2014-09-24 01:34:41 +00:00
Todd Poynor
623e93c04a
am 0908b92e: am ebeb0c0e: healthd: use warning level for info logs
...
* commit '0908b92ea9c4a1fe76568bcfb553a5eaa8064b06':
healthd: use warning level for info logs
2014-09-23 22:47:16 +00:00
Todd Poynor
0908b92ea9
am ebeb0c0e: healthd: use warning level for info logs
...
* commit 'ebeb0c0ea63af9fd8b2c8a7a20f919e48098ad9a':
healthd: use warning level for info logs
2014-09-23 22:35:58 +00:00
Todd Poynor
ebeb0c0ea6
healthd: use warning level for info logs
...
To allow healthd/charger info to appear in systems where the loglevel
has been bumped to squelch chatty drivers.
Change-Id: I4ab135765700d7584a1ce5d972ea473d77f299f8
2014-09-23 15:05:07 -07:00
Elliott Hughes
e4090c92ff
am 4f3ebaec: am 790e7c0a: am 3772545c: Merge "Switch adb to epoll(2)."
...
* commit '4f3ebaec16e7f899c4afb39ce9e08db6b989428c':
Switch adb to epoll(2).
2014-09-23 20:56:38 +00:00
Elliott Hughes
8b28a70980
am ed561793: am fbb4188c: am d559d6c7: Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)."
...
* commit 'ed561793f304fd6cbc248223ec71b93dcc126562':
defined(HAVE_OFF_T) is really just !defined(__APPLE__).
2014-09-23 19:07:59 +00:00
Elliott Hughes
4f3ebaec16
am 790e7c0a: am 3772545c: Merge "Switch adb to epoll(2)."
...
* commit '790e7c0ac46bca5ad511ba8764bbb0e9646c6f2a':
Switch adb to epoll(2).
2014-09-23 18:57:42 +00:00
Elliott Hughes
790e7c0ac4
am 3772545c: Merge "Switch adb to epoll(2)."
...
* commit '3772545c22fb28e27d150c97f88dd3b7c0a7c741':
Switch adb to epoll(2).
2014-09-23 18:45:35 +00:00
Elliott Hughes
3772545c22
Merge "Switch adb to epoll(2)."
2014-09-23 18:36:24 +00:00
Elliott Hughes
67de1557b0
Switch adb to epoll(2).
...
Bug: 17588403
Change-Id: I2590f5e7dd4e178ff4f743609c5ef0155b1015a1
2014-09-23 10:40:51 -07:00
Elliott Hughes
35d6017457
am 28891d26: am ae3a8961: am fed0f06b: Merge "init: Fix memory corruption when sanitizing platform paths"
...
* commit '28891d262f21988ef3d43e4a3dfca0c9d4370cf8':
init: Fix memory corruption when sanitizing platform paths
2014-09-23 16:20:24 +00:00
Dan Albert
8647769f2f
am 641ced11: am ffbb05e6: am fbe58079: Merge "Fix warning for uninitialized variable."
...
* commit '641ced1127ef12e8d223bf5fe75e9e6a2f75c818':
Fix warning for uninitialized variable.
2014-09-23 16:20:02 +00:00
Elliott Hughes
ed561793f3
am fbb4188c: am d559d6c7: Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)."
...
* commit 'fbb4188cfac18b457801cf3e304bfa39dd29dde8':
defined(HAVE_OFF_T) is really just !defined(__APPLE__).
2014-09-23 16:05:52 +00:00
Elliott Hughes
fbb4188cfa
am d559d6c7: Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)."
...
* commit 'd559d6c72a411d14c7a964dad1eb7f6e229314cb':
defined(HAVE_OFF_T) is really just !defined(__APPLE__).
2014-09-23 15:59:01 +00:00
Elliott Hughes
d559d6c72a
Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)."
2014-09-23 15:51:10 +00:00
Elliott Hughes
cb3d65323d
defined(HAVE_OFF_T) is really just !defined(__APPLE__).
...
Change-Id: I83c271bfe24b777acf293d2b4ac5af2cce8398b9
2014-09-22 20:50:54 -07:00
Elliott Hughes
28891d262f
am ae3a8961: am fed0f06b: Merge "init: Fix memory corruption when sanitizing platform paths"
...
* commit 'ae3a8961f01e436a70cab569483b8ebcc1f56c0c':
init: Fix memory corruption when sanitizing platform paths
2014-09-23 02:17:04 +00:00
Elliott Hughes
ae3a8961f0
am fed0f06b: Merge "init: Fix memory corruption when sanitizing platform paths"
...
* commit 'fed0f06bf04c6de90ae7b2f8ae9158ab2200498e':
init: Fix memory corruption when sanitizing platform paths
2014-09-23 02:05:55 +00:00
Elliott Hughes
fed0f06bf0
Merge "init: Fix memory corruption when sanitizing platform paths"
2014-09-23 01:55:08 +00:00
Christopher R. Palmer
07f3fee164
init: Fix memory corruption when sanitizing platform paths
...
This commit fixes code that incorrectly increments s when it
hits the terminator character of the string being sanitized.
This means it will randomly start trashing memory beyond the
end of the string being sanitized until it happens to hit two
NULs (\0\0) which will break it out of the loop.
Change-Id: I76553d7f183236a78a0bc7b408e92559b98f732f
2014-09-22 20:42:25 -04:00
Dan Albert
641ced1127
am ffbb05e6: am fbe58079: Merge "Fix warning for uninitialized variable."
...
* commit 'ffbb05e6744e8de1bfc40fde17aae401217ea003':
Fix warning for uninitialized variable.
2014-09-22 23:23:29 +00:00
Dan Albert
ffbb05e674
am fbe58079: Merge "Fix warning for uninitialized variable."
...
* commit 'fbe58079b4ac12462f1ad7a23ff745919621b8dd':
Fix warning for uninitialized variable.
2014-09-22 23:11:29 +00:00
Dan Albert
fbe58079b4
Merge "Fix warning for uninitialized variable."
2014-09-22 23:01:12 +00:00
Dan Albert
5c957e2d4f
Fix warning for uninitialized variable.
...
Change-Id: I78e6a20562419dcc2fb3f579089b32aeb5538f8b
2014-09-22 15:26:39 -07:00
Eric Laurent
f6cce347a7
audio: add HW hotword capture flag
...
Bug: 17575019.
Change-Id: I12c0a2e0200f3d839dfd74650724391e54ac3534
2014-09-19 17:45:18 -07:00
Mark Salyzyn
c2ef9f14f2
am 69038d36: am 7e2af0cc: am 810814d0: Merge "logd: auditd: kmsg priority"
...
* commit '69038d3637f8a65dc65f6a05f425d92e62f31fdc':
logd: auditd: kmsg priority
2014-09-19 23:28:26 +00:00
Mark Salyzyn
69038d3637
am 7e2af0cc: am 810814d0: Merge "logd: auditd: kmsg priority"
...
* commit '7e2af0ccc3dec0b461977738cabb2e48b9597295':
logd: auditd: kmsg priority
2014-09-19 19:28:26 +00:00
Mark Salyzyn
7e2af0ccc3
am 810814d0: Merge "logd: auditd: kmsg priority"
...
* commit '810814d09b7e4da9744fc5991ee49b9d8e7c9755':
logd: auditd: kmsg priority
2014-09-19 19:14:37 +00:00
Mark Salyzyn
810814d09b
Merge "logd: auditd: kmsg priority"
2014-09-19 19:07:30 +00:00
Mark Salyzyn
6bdeee0ce6
logd: auditd: kmsg priority
...
Change-Id: I2016fe140e2daf6c69efbd10aef205fffb931aa1
2014-09-19 11:59:42 -07:00
Mark Salyzyn
aaf18b32e8
am b14b958d: am b210403a: am 98d3aa3f: Merge "logcat: tests: deal with -v threadtime default"
...
* commit 'b14b958d166adfe902cb64335820db9cc839d42e':
2014-09-19 08:27:02 +00:00
Elliott Hughes
b87dc5673f
am bdac7202: am 6c03b85f: am 32e2f1be: Merge "Clean up memset[16,32] routines: unify files names, remove redundant wrapper for 32-bit, remove Atom caches sizes for 64-bit, fix license."
...
* commit 'bdac7202553a519dc047a39644c9c01fb0e78724':
2014-09-19 08:11:50 +00:00
Paul Lawrence
caad5222c1
am 40b34524: am 40af0929: Fix charger mode on first boot of force encrypt devices
...
* commit '40b34524bb05cdc6664ba27770c2ca4499280d28':
2014-09-19 07:40:55 +00:00
Daniel Rosenberg
da7fda72aa
am aa3ed784: am 81b857f3: Merge "fastboot: Remove tos from flashall" into lmp-dev
...
* commit 'aa3ed7844a60b08fda8dc6ad371b60612347eeb4':
2014-09-19 07:40:55 +00:00
Esteban de la Canal
d29edf0d94
am 757adc21: am a5ab96eb: 74602: Fixes adb not seeing connected devices on Mac.
...
* commit '757adc21c373f565827d7d8168051319c830d701':
2014-09-19 07:40:54 +00:00
Kenny Root
b2967dd178
am ebae1bfe: am 46679c1d: am 8d35442b: Merge "fix windows build"
...
* commit 'ebae1bfeaa11a9fd3a3406ff277b70435c7850bd':
2014-09-19 06:17:05 +00:00
Kenny Root
f1ce3f4f82
am 0a19c517: resolved conflicts for merge of d9714d34 to lmp-mr1-dev-plus-aosp
...
* commit '0a19c517b775ad0e3a66d896dd8a3b01bb476e08':
2014-09-19 06:16:41 +00:00
Christopher Ferris
63de927490
am 912514ee: am f37bfb32: am 23aeeff5: Merge "Use the correct fuse_init_out structure size."
...
* commit '912514eeb7bc0e466ecafc5a3d9dda81fc1e5a93':
2014-09-19 06:16:40 +00:00
Mark Salyzyn
c723eb9cec
am c7490422: am a9d789dd: am a3e53f1d: Merge "logcat: -v format defaults to threadtime"
...
* commit 'c7490422987172d9d343092ad2ffcb21da025bfb':
2014-09-19 06:16:38 +00:00
Mark Salyzyn
831b3e7163
am 508a8976: am b210403a: am 98d3aa3f: Merge "logcat: tests: deal with -v threadtime default"
...
* commit '508a897634f5a25c28db0ac0746b28ac3968a1d4':
logcat: tests: deal with -v threadtime default
2014-09-18 17:59:02 +00:00
Mark Salyzyn
508a897634
am b210403a: am 98d3aa3f: Merge "logcat: tests: deal with -v threadtime default"
...
* commit 'b210403a8bf417e9f88bcca0a2a652d533f6c524':
logcat: tests: deal with -v threadtime default
2014-09-18 17:47:29 +00:00
Mark Salyzyn
b14b958d16
am b210403a: am 98d3aa3f: Merge "logcat: tests: deal with -v threadtime default"
...
* commit 'b210403a8bf417e9f88bcca0a2a652d533f6c524':
logcat: tests: deal with -v threadtime default
2014-09-18 17:47:28 +00:00
Mark Salyzyn
b210403a8b
am 98d3aa3f: Merge "logcat: tests: deal with -v threadtime default"
...
* commit '98d3aa3f0d76190dbeea6248fffe326f7b6fe47d':
logcat: tests: deal with -v threadtime default
2014-09-18 17:35:26 +00:00
Mark Salyzyn
98d3aa3f0d
Merge "logcat: tests: deal with -v threadtime default"
2014-09-18 17:27:56 +00:00
Mark Salyzyn
a5e2429f09
logcat: tests: deal with -v threadtime default
...
- specify -v brief where necessary to preserve tests
- fix an occasional issue for logrotate and device block size
Change-Id: I09b02cc0359dc351a89311abc3ee762a0f23582c
2014-09-18 10:25:38 -07:00
Elliott Hughes
7653e965b3
am f9cdbb1a: am 6c03b85f: am 32e2f1be: Merge "Clean up memset[16,32] routines: unify files names, remove redundant wrapper for 32-bit, remove Atom caches sizes for 64-bit, fix license."
...
* commit 'f9cdbb1a308137217f0a9055f967731d00e67fba':
Clean up memset[16,32] routines: unify files names, remove redundant wrapper for 32-bit, remove Atom caches sizes for 64-bit, fix license.
2014-09-18 03:38:56 +00:00
Elliott Hughes
f9cdbb1a30
am 6c03b85f: am 32e2f1be: Merge "Clean up memset[16,32] routines: unify files names, remove redundant wrapper for 32-bit, remove Atom caches sizes for 64-bit, fix license."
...
* commit '6c03b85f1dcfd0efd2ec741cbfb6c5ecc404fbd8':
Clean up memset[16,32] routines: unify files names, remove redundant wrapper for 32-bit, remove Atom caches sizes for 64-bit, fix license.
2014-09-18 03:23:47 +00:00
Elliott Hughes
bdac720255
am 6c03b85f: am 32e2f1be: Merge "Clean up memset[16,32] routines: unify files names, remove redundant wrapper for 32-bit, remove Atom caches sizes for 64-bit, fix license."
...
* commit '6c03b85f1dcfd0efd2ec741cbfb6c5ecc404fbd8':
Clean up memset[16,32] routines: unify files names, remove redundant wrapper for 32-bit, remove Atom caches sizes for 64-bit, fix license.
2014-09-18 03:23:08 +00:00