Mark Salyzyn
327cac6e0c
logd: auditd: kmsg priority
...
(cherry pick from commit 6bdeee0ce6
)
Change-Id: I2016fe140e2daf6c69efbd10aef205fffb931aa1
2014-10-08 14:01:45 -07:00
Riley Andrews
33b335495c
Merge "Make the default cgroup, the foreground cgroup." into lmp-mr1-dev
2014-10-08 20:40:23 +00:00
Elliott Hughes
2c05b4fe41
Fix top for very large VSS.
...
Bug: 17913995
(cherry picked from commit 052d78f334
)
Change-Id: Ia657c1aa5776f947905d8b0d499d64b5cfbae50c
2014-10-08 11:21:23 -07: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
Riley Andrews
522d72b702
Make the default cgroup, the foreground cgroup.
...
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
2014-10-07 19:24:54 +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
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
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
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
Mike Lockwood
7e58899bcf
Add bootanimation to audio group so it can play boot sound
...
Bug: 17674304
Change-Id: I5d31bc024fa36fedac2c0ba5c4a8b100937183ad
2014-10-02 16:22:43 -07:00
Jesse Hall
5a9d721bae
am 10b13131: am c263e671: Merge "init.trace.rc: fix race condition with class_start core" into lmp-dev
...
* commit '10b131314d461d5fd94aeff0565942e04d03e16b':
init.trace.rc: fix race condition with class_start core
2014-10-02 21:09:35 +00:00
Jesse Hall
10b131314d
am c263e671: Merge "init.trace.rc: fix race condition with class_start core" into lmp-dev
...
* commit 'c263e671dfbc5d968275f6c088f05c21d1528325':
init.trace.rc: fix race condition with class_start core
2014-10-02 21:01:58 +00:00
Jesse Hall
c263e671df
Merge "init.trace.rc: fix race condition with class_start core" into lmp-dev
2014-10-02 20:56:29 +00:00
Stephen Hines
a866e5a8eb
am 6cf1193b: am 2f431a8d: Fix windows-specific error without messing up Makefile flags.
...
* commit '6cf1193bcff2c2f1a43abeeac1ad2b33e422182e':
Fix windows-specific error without messing up Makefile flags.
2014-10-02 00:59:36 +00:00
Stephen Hines
6cf1193bcf
am 2f431a8d: Fix windows-specific error without messing up Makefile flags.
...
* commit '2f431a8d5a1c2029af470a7336751a555131ee51':
Fix windows-specific error without messing up Makefile flags.
2014-10-02 00:53:26 +00:00
Stephen Hines
2f431a8d5a
Fix windows-specific error without messing up Makefile flags.
...
Bug: 14416410
The proper fix for the error/warning we encountered is to move winsock2.h
in front of windows.h.
Change-Id: I29504ba3a184a85c6636d06c2ad900828fdb5436
2014-10-01 17:37:06 -07:00
Stephen Hines
541a780454
am 490f03d5: am 3ea87c33: Fix build breakage for missing -Wcpp option on old GCC versions.
...
* commit '490f03d560e873ad73f964815ca109381efec147':
Fix build breakage for missing -Wcpp option on old GCC versions.
2014-10-02 00:36:09 +00:00
Stephen Hines
490f03d560
am 3ea87c33: Fix build breakage for missing -Wcpp option on old GCC versions.
...
* commit '3ea87c33a1c6e940322f5436cf0dd70a0bdadd75':
Fix build breakage for missing -Wcpp option on old GCC versions.
2014-10-02 00:27:50 +00:00
Stephen Hines
3ea87c33a1
Fix build breakage for missing -Wcpp option on old GCC versions.
...
Bug: 14416410
Change-Id: Ib30c3739d50d6122b3b4643051c72f2fa4985686
2014-10-01 17:16:37 -07:00
Dmitriy Ivanov
2ae2dd0db8
Merge "Add -std=gnu++11 to test cflags" into lmp-mr1-dev
2014-10-01 23:56:36 +00:00
Dmitriy Ivanov
8386725771
Add -std=gnu++11 to test cflags
...
(cherry picked from commit 5f68087efe
)
Change-Id: I6fc0d3673391654aa72e1e6bd98f4a8469c79868
2014-10-01 16:40:41 -07:00
Stephen Hines
4acabfee9e
am 64f44b84: Merge "Remove obsolete reference to ddk; Fixes for -Werror" into lmp-dev
...
* commit '64f44b8444dabd69cf391d42e10d44e8e926a79d':
Remove obsolete reference to ddk; Fixes for -Werror
2014-10-01 23:04:55 +00:00
Stephen Hines
64f44b8444
Merge "Remove obsolete reference to ddk; Fixes for -Werror" into lmp-dev
2014-10-01 22:53:51 +00:00
Calin Juravle
3684c83687
am 00851a53: Use initUnchangeableSystemProperty for initializing os.arch.
...
* commit '00851a53bebe16dd2a0460245505461f40a7a307':
Use initUnchangeableSystemProperty for initializing os.arch.
2014-10-01 19:53:54 +00:00
Fred Fettinger
331a939bf8
init.trace.rc: fix race condition with class_start core
...
The systrace permissions from init.trace.rc and the "class_start core"
which launches surfaceflinger are both in an "on boot" section. However,
the init.trace.rc commands are parsed after all commands in init.rc.
This means that "class_start core" is executed before the chmod command
which allows processes to write to trace_marker. If any services
execute their first trace command before the chmod occurs, then that
service won't be able to write traces until the service is restarted.
To fix this, run all of the init.trace.rc commands in the "early-boot"
section to ensure they are completed first.
Bug: 17612265
Change-Id: Ibf544762173d5ba98272c66ef485d8eab7d70bf3
2014-10-01 12:29:29 -07:00
Calin Juravle
00851a53be
Use initUnchangeableSystemProperty for initializing os.arch.
...
Bug: 17713104
Change-Id: Ic847579981efcd2fd0526c994d786ee8b7a8a316
2014-10-01 18:57:59 +01:00
Brian Carlstrom
5a0f0e9710
am 479ce0c1: Merge "Fix mac build for nativebridge tests." into lmp-dev
...
* commit '479ce0c1f3d9ecbaf7947651a5e00828ec522f15':
Fix mac build for nativebridge tests.
2014-10-01 00:52:55 +00:00
Vince Harron
0edbf89e68
am c75dac39: Merge "fix for adbd pinning CPU" into lmp-dev
...
* commit 'c75dac394e3fcd9760841a820d8a0c93dd0c276e':
fix for adbd pinning CPU
2014-10-01 00:52:28 +00:00
Mark Salyzyn
2f207af869
am 7391575a: logd: in nonblocking read, sched_yield() synchronization
...
* commit '7391575afdd6c27bf444dcde7a140f1b17629b8c':
logd: in nonblocking read, sched_yield() synchronization
2014-09-30 16:31:51 +00:00
Andrew Hsieh
b75d6f1429
Remove obsolete reference to ddk; Fixes for -Werror
...
Bug: 14416410
1. The new mingw-w64 toolchain x86_64-w64-mingw32-4.8 has ddk
in x86_64-w64-mingw32/include/ddk
2. Add -Wno-error=cpp to suppress a warning that turns into error
thanks to -Werror:
Please include winsock2.h before windows.h
3. Cast GetLastError() return type DWORD to "int"
4. Include direct.h for _mkdir
5. Include stdint.h for uint8_t on Windows
Change-Id: I4bec0587f6573692f08c760da6c98ae551b8b5eb
2014-09-30 02:24:07 -07:00
Brian Carlstrom
479ce0c1f3
Merge "Fix mac build for nativebridge tests." into lmp-dev
2014-09-30 04:19:54 +00:00
Vince Harron
c75dac394e
Merge "fix for adbd pinning CPU" into lmp-dev
2014-09-30 03:01:07 +00:00
Mark Salyzyn
7391575afd
logd: in nonblocking read, sched_yield() synchronization
...
- sched_yield and lock synchronization in reader thread
startup to give writer thread a chance to catch up
(cherry picked from commit f669acb018
)
Bug: 17512203
Change-Id: I43cf0b4e2829b22b3ab4e537fa95ce13c76a869c
2014-09-29 11:09:22 -07:00
Calin Juravle
7e5a0aca2c
Fix mac build for nativebridge tests.
...
Bug: 17671501
Change-Id: Id0d729a25a5cea2fed5005cdea750e9e94f46d21
2014-09-29 15:57:43 +01:00
jgu21
2d83ca4cc1
am b3facbfd: LibNativeBridge: Add early init & env setup
...
* commit 'b3facbfdecf46eb7c063b99529ab8c18a08a6b42':
LibNativeBridge: Add early init & env setup
2014-09-29 03:37:07 +00:00
Ruchi Kandoi
bdf11c76a3
healthd: Add callback for screen_on to the healthdHAL
...
Adds a callback to the healthdHAL which can check for device specific
properties to decide if the screen should turn on.
Change-Id: I543e7729ecb291157df4d3be1bd718f8af01ac40
Signed-off-by: Ruchi Kandoi<kandoiruchi@google.com>
2014-09-26 14:37:17 -07:00
jgu21
b3facbfdec
LibNativeBridge: Add early init & env setup
...
Add a method to set up /proc/cpuinfo with enough privileges. Set
up the environment for an app in InitializeNativeBridge().
Turn on -Wall for libnativebridge.
(cherry picked from commit 962eb40abb
)
(cherry picked from commit ab0da5a9a6
)
(cherry picked from commit 2f71cb24fa
)
(cherry picked from commit 04054e28e2
)
(cherry picked from commit 4390a63236
)
Bug: 17671501
Change-Id: Id4f4127d82737b5e56a77175e1068ff5cea60f9d
2014-09-26 13:04:36 -07:00
Vince Harron
af436b1e10
fix for adbd pinning CPU
...
adbd was spinning between select & read (0 bytes) for an adb_auth
socket. The read documentation states: "On success, the number of
bytes read is returned (zero indicates end of file)" so the code has
been modified to close the connection (like the read error case).
BUG=17419868
Change-Id: I1d8fb70c8e1876225ba8d47ea0a2b6265a7d182b
2014-09-25 21:51:15 -07:00
Andreas Gampe
ea52030bc6
am 8dd3ea58: Merge "Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"" into lmp-dev
...
* commit '8dd3ea58fdd99912f631156c37bcb2555ce8aec3':
Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"
2014-09-25 22:02:24 +00:00
Andreas Gampe
8dd3ea58fd
Merge "Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"" into lmp-dev
2014-09-25 21:55:34 +00:00