Josh Gao
512b191d80
resolve merge conflicts of 557749e55b to klp-modular-dev DO NOT MERGE am: bdfb431467 -s ours am: 1eb6ec56c2 am: 9cde309103 -s ours
...
am: 75708e52d3
2016-02-24 21:59:29 +00:00
Josh Gao
c663d0482b
resolve merge conflicts of 9515c23e16 to klp-modular-dev am: 91b48c3796 -s ours am: adc3bcb1d5 am: 7e10520392
...
am: b97b07e55b
2016-02-24 21:52:52 +00:00
Josh Gao
75708e52d3
resolve merge conflicts of 557749e55b to klp-modular-dev DO NOT MERGE am: bdfb431467 -s ours am: 1eb6ec56c2
...
am: 9cde309103
2016-02-24 21:46:12 +00:00
Josh Gao
b97b07e55b
resolve merge conflicts of 9515c23e16 to klp-modular-dev am: 91b48c3796 -s ours am: adc3bcb1d5
...
am: 7e10520392
2016-02-24 21:37:04 +00:00
Josh Gao
9cde309103
resolve merge conflicts of 557749e55b to klp-modular-dev DO NOT MERGE am: bdfb431467 -s ours
...
am: 1eb6ec56c2
2016-02-24 21:36:59 +00:00
Josh Gao
1eb6ec56c2
resolve merge conflicts of 557749e55b to klp-modular-dev DO NOT MERGE
...
am: bdfb431467
2016-02-24 21:30:37 +00:00
Josh Gao
7e10520392
resolve merge conflicts of 9515c23e16 to klp-modular-dev am: 91b48c3796 -s ours
...
am: adc3bcb1d5
2016-02-24 21:30:36 +00:00
Josh Gao
adc3bcb1d5
resolve merge conflicts of 9515c23e16 to klp-modular-dev
...
am: 91b48c3796
2016-02-24 21:23:55 +00:00
Josh Gao
bdfb431467
resolve merge conflicts of 557749e55b to klp-modular-dev DO NOT MERGE
...
Change-Id: I51653e2ba8e7d1fa345206a4dd8b15f2e29429f2
2016-02-24 13:20:48 -08:00
Josh Gao
91b48c3796
resolve merge conflicts of 9515c23e16 to klp-modular-dev
...
Change-Id: I4b39875ce57bb1ea55898db3ffc004a491bbeaa4
2016-02-24 12:08:28 -08:00
Nick Kralevich
b760e61686
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313 am: c61a896f20 -s ours am: d61ebb0851 am: 75ccd732f3 -s ours
...
am: 505a431468
2016-02-24 19:43:01 +00:00
Nick Kralevich
505a431468
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313 am: c61a896f20 -s ours am: d61ebb0851
...
am: 75ccd732f3
2016-02-24 19:31:07 +00:00
Josh Gao
338f1802ee
Don\'t create tombstone directory. am: cb9625cbe5 am: 99b8a56616
...
am: 0cf99e2b61
2016-02-24 19:25:50 +00:00
Nick Kralevich
75ccd732f3
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313 am: c61a896f20 -s ours
...
am: d61ebb0851
2016-02-24 19:25:39 +00:00
Nick Kralevich
6d7ce7b14c
ensure /data/tombstones exists on all Android devices am: e2796207ee am: 9660c6759e
...
am: 4d4eb0db97
2016-02-24 19:25:38 +00:00
Nick Kralevich
d61ebb0851
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
...
am: c61a896f20
2016-02-24 19:18:41 +00:00
Josh Gao
0cf99e2b61
Don\'t create tombstone directory. am: cb9625cbe5
...
am: 99b8a56616
2016-02-24 19:11:53 +00:00
Nick Kralevich
4d4eb0db97
ensure /data/tombstones exists on all Android devices am: e2796207ee
...
am: 9660c6759e
2016-02-24 19:11:42 +00:00
Nick Kralevich
c61a896f20
ensure /data/tombstones exists on all Android device. DO NOT MERGE
...
am: 9c0ed66313
2016-02-24 19:11:38 +00:00
Josh Gao
99b8a56616
Don\'t create tombstone directory.
...
am: cb9625cbe5
2016-02-24 19:05:34 +00:00
Nick Kralevich
9660c6759e
ensure /data/tombstones exists on all Android devices
...
am: e2796207ee
2016-02-24 19:05:12 +00:00
William Luh
769cba57e4
Add macro to call event logger for errors. DO NOT MERGE
...
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
2016-02-23 16:04:34 -08:00
Josh Gao
cb9625cbe5
Don't create tombstone directory.
...
Partial backport of cf79748.
Bug: http://b/26403620
Change-Id: Ib877ab6cfab6aef079830c5a50ba81141ead35ee
2016-02-16 15:09:46 -08:00
Nick Kralevich
e2796207ee
ensure /data/tombstones exists on all Android devices
...
/data/tombstones is referenced by core platform code, but is not
guaranteed to exist on all Android devices. Move the directory
creation out of device specific files and into the core
init.rc file.
Bug: https://code.google.com/p/android/issues/detail?id=93207
Change-Id: I94ae5199a6a32c4fe555ca994fc4a8345e0c9690
Bug: http://b/26403620
(cherry picked from commit 0359d778a5
2016-02-16 15:09:43 -08:00
Josh Gao
557749e55b
Don't create tombstone directory. DO NOT MERGE
...
Partial backport of cf79748.
Bug: http://b/26403620
Change-Id: I412889bfa331c96ad8e2ce6e0d66b54fb230e8c0
2016-02-16 15:07:35 -08:00
Josh Gao
9515c23e16
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
...
Effectively a cherry-pick of 04f9b2ahttp://b/26403620
Change-Id: I0437fdc774501f428d8b4f8dd7682b32eaa29cef
2016-02-16 15:07:35 -08:00
Nick Kralevich
9c0ed66313
ensure /data/tombstones exists on all Android device. DO NOT MERGE
...
/data/tombstones is referenced by core platform code, but is not
guaranteed to exist on all Android devices. Move the directory
creation out of device specific files and into the core
init.rc file.
Bug: https://code.google.com/p/android/issues/detail?id=93207
Change-Id: I94ae5199a6a32c4fe555ca994fc4a8345e0c9690
Bug: http://b/26403620
(cherry picked from commit 0359d778a5
2016-02-16 15:07:29 -08:00
Jon Larimer
088639a20f
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours am: 362f13d74a am: 702fe6d486 -s ours
...
am: ea1e6a59e7
2015-11-11 20:37:57 +00:00
Jon Larimer
089ad5e98a
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56 am: 442a830e9b -s ours
...
am: 93a3871abb
2015-11-11 20:37:51 +00:00
Jon Larimer
d0ed7943b8
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev
...
am: f84eef3fca
2015-11-11 20:37:43 +00:00
Jon Larimer
ea1e6a59e7
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours am: 362f13d74a
...
am: 702fe6d486
2015-11-11 14:02:59 +00:00
Jon Larimer
702fe6d486
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158 am: fd56dc41c7 -s ours
...
am: 362f13d74a
2015-11-11 13:59:19 +00:00
Jon Larimer
362f13d74a
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev am: 809d5a0158
...
am: fd56dc41c7
2015-11-11 13:55:57 +00:00
Jon Larimer
fd56dc41c7
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev
...
am: 809d5a0158
2015-11-11 13:50:40 +00:00
Jon Larimer
93a3871abb
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev am: 5280061b56
...
am: 442a830e9b
2015-11-11 13:50:39 +00:00
Jon Larimer
442a830e9b
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev
...
am: 5280061b56
2015-11-11 13:46:21 +00:00
Jon Larimer
f84eef3fca
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-mr1-dev
2015-11-11 13:42:37 +00:00
Jon Larimer
5280061b56
Merge "Add macro to call event logger for errors. DO NOT MERGE" into lmp-dev
2015-11-11 13:42:35 +00:00
Jon Larimer
809d5a0158
Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev
2015-11-11 13:42:33 +00:00
William Luh
9a86c283cd
Add macro to call event logger for errors. DO NOT MERGE
...
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
2015-11-10 22:33:46 +00:00
William Luh
f34258fa9b
Add macro to call event logger for errors. DO NOT MERGE
...
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
2015-11-10 22:33:32 +00:00
William Luh
4fd82100cc
Add macro to call event logger for errors. DO NOT MERGE
...
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
2015-11-10 22:33:10 +00:00
Narayan Kamath
26d47f2671
am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE.
...
* commit '491035ce1ceec310f98347654ea17cafa6ccb520':
Follow up to change b638126ed
2015-09-20 00:08:45 +00:00
Narayan Kamath
81b428f27a
am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev
...
* commit 'db7d8e963c54246a2792e91c678bbe00fb2cc3aa':
libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
2015-09-20 00:08:44 +00:00
Brian Carlstrom
832a0d1c64
resolved conflicts for cf676a86 to lmp-mr1-ub-dev
...
Change-Id: Ifd9a44777a472ae893f894391bff7ef81456d92c
2015-09-19 16:13:00 -07:00
Narayan Kamath
491035ce1c
am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE.
...
* commit '8253cb0436a09dcb325dbdecf4689b0a18b25644':
Follow up to change b638126ed
2015-09-17 23:03:11 +00:00
Narayan Kamath
db7d8e963c
am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev
...
* commit '68a7837088c40e367ebf16959adc9d20d06ef0ea':
libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
2015-09-17 23:03:10 +00:00
Narayan Kamath
cf676a8686
am 52edd8bd: am 419e6c3c: libutils: Fix integer overflows in VectorImpl.
...
* commit '52edd8bdf3e83f41f4df4bb5e9e44d0bc0c56a37':
libutils: Fix integer overflows in VectorImpl.
2015-09-17 23:01:45 +00:00
Narayan Kamath
8253cb0436
am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE.
...
* commit '0cc468dc2a1420d5c9dac563cc6c5d11b862ff47':
Follow up to change b638126ed
2015-09-12 09:46:19 +00:00
Narayan Kamath
68a7837088
am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev
...
* commit '2e64e9590a36511eaaf655b24002d24afe927f04':
libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
2015-09-12 09:46:18 +00:00
