Nick Kralevich
4d4eb0db97
ensure /data/tombstones exists on all Android devices am: e2796207ee
...
am: 9660c6759e
* commit '9660c6759e165ddbc91f823672ba9631199ae9dc':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:11:42 +00:00
Nick Kralevich
9660c6759e
ensure /data/tombstones exists on all Android devices
...
am: e2796207ee
* commit 'e2796207ee5a1ff2ebea30bdcf6d2c2553546b86':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:05:12 +00: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
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 -s ours
* commit '702fe6d486d2bdd920010d681b046a3396b4021a':
Add macro to call event logger for errors. DO NOT MERGE
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
* commit '362f13d74a5c57f4e2ba4f0de341896e79732dcf':
Add macro to call event logger for errors. DO NOT MERGE
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 -s ours
* commit 'fd56dc41c70a58541b9ed25f4c97ffe3fea19536':
Add macro to call event logger for errors. DO NOT MERGE
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
* commit '809d5a01586d00ee91d13fb8d034d12584ba3314':
Add macro to call event logger for errors. DO NOT MERGE
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 -s ours
* commit '442a830e9b0415460749016394b3a71b9df2af13':
Add macro to call event logger for errors. DO NOT MERGE
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
* commit '5280061b5668d87b99ff4f9ef883a3fed944bce4':
Add macro to call event logger for errors. DO NOT MERGE
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
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 DO NOT MERGE.
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 DO NOT MERGE.
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
Narayan Kamath
0cc468dc2a
am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE.
...
* commit 'fef9dffd96e8bc6f2283a57cd0b29df4be43eb46':
Follow up to change b638126ed DO NOT MERGE.
2015-09-12 08:49:20 +00:00
Narayan Kamath
2e64e9590a
am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev
...
* commit 'a82d6dc3bf18b74aab4e8fb497b08e02f4a1ec8d':
libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
2015-09-12 08:49:15 +00:00
Narayan Kamath
52edd8bdf3
am 419e6c3c: libutils: Fix integer overflows in VectorImpl.
...
* commit '419e6c3c68413bd6dbb6872340b2ae0d69a0fd60':
libutils: Fix integer overflows in VectorImpl.
2015-09-12 06:30:18 +00:00
Narayan Kamath
fef9dffd96
am 6c53de92: Follow up to change b638126ed DO NOT MERGE.
...
* commit '6c53de92cf7e759488538280788325fac6ccdea2':
Follow up to change b638126ed DO NOT MERGE.
2015-09-11 09:50:09 +00:00
Narayan Kamath
a82d6dc3bf
resolved conflicts for b638126e to klp-modular-dev
...
Change-Id: If5062b01afa95279ab25fe86aaafa89d4d74eaa1
2015-09-10 22:00:26 +01:00
Narayan Kamath
6c53de92cf
Follow up to change b638126ed DO NOT MERGE.
...
Resolves delta between the kitkat and L version of this patch.
Fixes the molly build on klp-dev.
bug: 22953624
Change-Id: I696a506320f30d3d5cd95f6da35361244986cb36
2015-09-10 20:30:59 +00:00
Narayan Kamath
419e6c3c68
libutils: Fix integer overflows in VectorImpl.
...
Use external/safe-iop to check for overflows on arithmetic
operations.
Also remove an unnecessary copy of Vector/SharedBuffer from
codeflinger and use the copy from libutils instead.
Note that some of the unit tests are somewhat useless due to
test-runner limitations : gtest's ability to filter on abort message
doesn't work when combined with messages formatted by android's logging
system.
bug: 22953624
(cherry picked from commit c609c31fb5 )
Change-Id: I61644633db6b54fa230683615de9724f7fabf6fb
2015-09-09 12:05:06 +01:00
Narayan Kamath
b638126ed3
libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
...
Use external/safe-iop to check for overflows on arithmetic
operations.
Also remove an unnecessary copy of Vector/SharedBuffer from
codeflinger and use the copy from libutils instead.
Note that some of the unit tests are somewhat useless due to
test-runner limitations : gtest's ability to filter on abort message
doesn't work when combined with messages formatted by android's logging
system.
bug: 22953624
(cherry picked from commit c609c31fb5 )
Change-Id: I673b7ab142bed4fcba9159a00a65cf6bca6b1f6c
2015-09-09 11:20:13 +01:00
Sergio Giro
7c327194fe
am 1dda45c7: am 0cc9a6e6: libutils: fix overflow in SharedBuffer [DO NOT MERGE]
...
* commit '1dda45c7d7605be2601b2f95b90b5673d6bac78c':
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
2015-08-25 16:49:18 +00:00
Sergio Giro
1dda45c7d7
am 0cc9a6e6: libutils: fix overflow in SharedBuffer [DO NOT MERGE]
...
* commit '0cc9a6e6e1f8e675c1238e5e05418cabcc699b52':
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
2015-08-25 16:43:54 +00:00
Sergio Giro
bd7dd79e8c
am 25592fbe: am ca15dfd0: am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
* commit '25592fbea0f38ea369a225e0ef9708442fc9e918':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 16:26:30 +00:00
Sergio Giro
0cc9a6e6e1
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
...
See
https://code.google.com/p/android/issues/detail?id=181910
Bug: 22952485
(cherry picked from commit 66b6eb9490 )
Change-Id: Ic71dd0025b9a7588c4f3bb1c7be1bd13d2ff5105
2015-08-25 16:18:16 +01:00
Sergio Giro
25592fbea0
am ca15dfd0: am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
* commit 'ca15dfd05cdeea7ed57578aa569831698324b2a0':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 14:19:08 +00:00
Sergio Giro
ca15dfd05c
am 3fe40514: (-s ours) am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
* commit '3fe4051430be1da4c1f119c165a4bb8b3a9dd499':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 14:11:49 +00:00
Sergio Giro
3fe4051430
am 66b6eb94: [DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
* commit '66b6eb9490beeeabc804d790c1c4060ce047afd4':
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
2015-08-25 14:06:38 +00:00
Sergio Giro
66b6eb9490
[DO NOT MERGE] libutils: fix overflow in SharedBuffer
...
See
https://code.google.com/p/android/issues/detail?id=181910
Bug: 22952485
(cherry picked from commit 7987b83553 )
Change-Id: I3cac87185f209dc79678ae702aa18afbdf4190df
2015-08-21 20:36:19 +01:00
Abhishek Arya
e45d96d6bf
am 19398a71: am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit '19398a712c53d27aaa2122cfae5d54168b8df0c9':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:36:01 +00:00
Abhishek Arya
19398a712c
am d34846b7: am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit 'd34846b70b7f6eb167722d45e0c717fa64116e90':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:29:00 +00:00
Abhishek Arya
d34846b70b
am cd407a17: am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit 'cd407a17fe326f3e18866ddddb1c747b06a45fc0':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:23:50 +00:00
Abhishek Arya
cd407a17fe
am e0dce90b: Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
* commit 'e0dce90b0de2b2b7c2baae8035f810a55526effb':
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-21 06:18:47 +00:00
Abhishek Arya
e0dce90b0d
Fix compile failure after rIfe1dc0791040150132bea6884f1e6c8d31972d1b
...
Bug: 23290056
Change-Id: If6e22b0159de6635a8ca5305895b7718f15becc7
2015-08-20 21:55:55 -07:00
Sergio Giro
e97682be06
am a1a22b57: am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8
...
* commit 'a1a22b5736d5ad71531fd07d5c4103585e8e8977':
libutils: fix overflow in String8::allocFromUTF8
2015-08-20 22:44:57 +00:00
Sergio Giro
a1a22b5736
am e67b5848: am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8
...
* commit 'e67b584869eea8d4e955e82de1e38ede080a2ed4':
libutils: fix overflow in String8::allocFromUTF8
2015-08-20 22:38:33 +00:00
Sergio Giro
e67b584869
am 4956c0fe: am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8
...
* commit '4956c0fe1e582a8497aff34a41aeb8bf4748eef0':
libutils: fix overflow in String8::allocFromUTF8
2015-08-20 22:28:53 +00:00
Sergio Giro
4956c0fe1e
am 5b85b1d4: libutils: fix overflow in String8::allocFromUTF8
...
* commit '5b85b1d40d619c2064d321364f212ebfeb6ba185':
libutils: fix overflow in String8::allocFromUTF8
2015-08-20 22:23:47 +00:00
Sergio Giro
5b85b1d40d
libutils: fix overflow in String8::allocFromUTF8
...
Patch contributed in:
https://code.google.com/p/android/issues/detail?id=182908
Bug: 23290056
(cherry picked from commit 4eeacbeec0 )
Change-Id: Ife1dc0791040150132bea6884f1e6c8d31972d1b
(cherry picked from commit ebabef2752 )
2015-08-18 20:52:25 +00:00
Adam Lesinski
1def25a210
Merge commit '7ac60686' into manualmerge
...
Change-Id: I671a57d906ca6826722fb892627d235b14b822eb
2015-05-27 17:09:14 -07:00
Adam Lesinski
7ac6068636
am 058ad0b6: am e8582d65: am 9bd7afc0: Prevent integer overflow when allocating native_handle_t
...
* commit '058ad0b6612457c54c7ad6e3b5d5a618d94ae966':
Prevent integer overflow when allocating native_handle_t
2015-05-27 23:40:35 +00:00
Adam Lesinski
058ad0b661
am e8582d65: am 9bd7afc0: Prevent integer overflow when allocating native_handle_t
...
* commit 'e8582d65ea03a91b5cdc2c374ec9a420f809138f':
Prevent integer overflow when allocating native_handle_t
2015-05-27 23:23:19 +00:00
Adam Lesinski
e8582d65ea
am 9bd7afc0: Prevent integer overflow when allocating native_handle_t
...
* commit '9bd7afc0a1de9589c13355178b6edc709bd0bddf':
Prevent integer overflow when allocating native_handle_t
2015-05-27 23:13:06 +00:00