Christopher Ferris
62a70df064
am dee1842d
: am adbb3352
: am a2d1469c
: Merge "Use new defines in test code."
...
* commit 'dee1842d2f6861dd4cb2d622992ec2c75f19ab3e':
Use new defines in test code.
2013-11-05 14:22:25 -08:00
Christopher Ferris
0186edee58
am 2e47c8ac
: am 1e1bae1b
: am c2945850
: Merge "Add some clarifying defines."
...
* commit '2e47c8ac74e070d62cfb46355c7c04797657c594':
Add some clarifying defines.
2013-11-05 14:22:20 -08:00
Elliott Hughes
9ef363ea7b
am f6e11efd
: am f4b3b73e
: am c8626ba4
: Merge "Dispose of ash."
...
* commit 'f6e11efd073741044fbcfe84347f1b21a551d3bf':
Dispose of ash.
2013-11-05 13:00:47 -08:00
Christopher Ferris
d709ad3da0
am 4ddea7f4
: am d5a7c371
: am 408b3acf
: Merge "Add corkscrew support for finding static symbols."
...
* commit '4ddea7f44c6362e7c34939302729e4508aa665c5':
Add corkscrew support for finding static symbols.
2013-11-05 13:00:47 -08:00
Christopher Ferris
dee1842d2f
am adbb3352
: am a2d1469c
: Merge "Use new defines in test code."
...
* commit 'adbb3352e9ce98e2012fa136198daa8342bdac00':
Use new defines in test code.
2013-11-05 12:19:00 -08:00
Christopher Ferris
adbb3352e9
am a2d1469c
: Merge "Use new defines in test code."
...
* commit 'a2d1469c773d809261d830d2f3cb3f6a7b6cdade':
Use new defines in test code.
2013-11-05 12:17:10 -08:00
Christopher Ferris
a2d1469c77
Merge "Use new defines in test code."
2013-11-05 20:15:29 +00:00
Christopher Ferris
7f081ec079
Use new defines in test code.
...
In addition, fix up the warnings and remove the -fpermissive when
compiling.
Change-Id: Ia27b902499b34ff3d881acb9057120af390baf2c
2013-11-05 12:13:05 -08:00
Christopher Ferris
2e47c8ac74
am 1e1bae1b
: am c2945850
: Merge "Add some clarifying defines."
...
* commit '1e1bae1b0fc750f60ef9a2531850bbcf27ba6610':
Add some clarifying defines.
2013-11-05 11:48:55 -08:00
Christopher Ferris
1e1bae1b0f
am c2945850
: Merge "Add some clarifying defines."
...
* commit 'c2945850e58f4ef50f3e3534ce50306262375d37':
Add some clarifying defines.
2013-11-05 11:44:33 -08:00
Christopher Ferris
c2945850e5
Merge "Add some clarifying defines."
2013-11-05 19:29:36 +00:00
Christopher Ferris
cbfc7302fb
Add some clarifying defines.
...
In order to be explicit in the Backtrace::Create() calls, adding a couple
of defines and some comments to describe what they mean.
Change-Id: I6ad08c529791821496a95fa33cea1c95b0a7eada
2013-11-05 11:05:32 -08:00
Elliott Hughes
f6e11efd07
am f4b3b73e
: am c8626ba4
: Merge "Dispose of ash."
...
* commit 'f4b3b73e95422afe79d5c5e7d28b0fcdfeaa7e88':
Dispose of ash.
2013-11-05 10:31:46 -08:00
Christopher Ferris
4ddea7f44c
am d5a7c371
: am 408b3acf
: Merge "Add corkscrew support for finding static symbols."
...
* commit 'd5a7c371d22ea327be03bfa10944e5f0f2d51a24':
Add corkscrew support for finding static symbols.
2013-11-05 10:31:45 -08:00
Elliott Hughes
f4b3b73e95
am c8626ba4
: Merge "Dispose of ash."
...
* commit 'c8626ba480c0e2cab4f4d2fe43bd8f741320b404':
Dispose of ash.
2013-11-05 10:30:02 -08:00
Christopher Ferris
d5a7c371d2
am 408b3acf
: Merge "Add corkscrew support for finding static symbols."
...
* commit '408b3acf5e0b0d353cf8b64598f285141d1a0116':
Add corkscrew support for finding static symbols.
2013-11-05 10:29:46 -08:00
Elliott Hughes
c8626ba480
Merge "Dispose of ash."
2013-11-05 18:00:27 +00:00
Elliott Hughes
f6e21e06e3
Dispose of ash.
...
We haven't used ash for several releases. Remove ash and its
companion liblinenoise.
I've left the support for an alternative shell here for now,
but we can move that out to external/mksh later if we want.
(For now this seemed like a somewhat useful signpost to the real shell.)
Change-Id: I634c7969f6cbe375a2bc56fc1077e64888380f3d
2013-11-05 09:44:57 -08:00
Christopher Ferris
408b3acf5e
Merge "Add corkscrew support for finding static symbols."
2013-11-04 23:19:53 +00:00
Christopher Ferris
923b536920
Add corkscrew support for finding static symbols.
...
Change-Id: Ie557a9b0efadece75e1accaa7e214fb559eb19e1
2013-11-04 14:50:36 -08:00
Lorenzo Colitti
d969d8e019
Merge "Support parsing RDNSS ND options from netlink."
2013-11-02 04:06:50 +00:00
Kristian Monsen
52aa2466ca
Fixes some warnings
...
- Implicit decleared function
- Unused variable
Change-Id: If60ad6f25aabf3b8fb68a2c9d8d75c7bda95c74a
2013-11-01 17:22:14 -07:00
Lorenzo Colitti
b185e90dcc
Support parsing RDNSS ND options from netlink.
...
The RDNSS options (RFC 6106) used to configure DNS servers via
router advertisements are passed from the kernel to userspace via
RTM_NEWNDUSEROPT netlink messages. Add code to NetlinkEvent to
parse them.
Also fix a compiler warning and a couple of style issues.
Bug: 9180552
Change-Id: I6c532c8f0ceef3afdc977a431a036df398013e1a
2013-11-01 14:05:02 +09:00
Shuo Gao
f1e072780e
am eb0eb4f7
: fix corruption in Vector<> when malloc falied
...
* commit 'eb0eb4f79fca083009aa7a6b6e28ddcdbcbd1214':
fix corruption in Vector<> when malloc falied
2013-10-31 09:50:53 -07:00
Shuo Gao
eb0eb4f79f
fix corruption in Vector<> when malloc falied
...
1. When alloc or realloc failed in the function SharedBuffer::editResize,
it would return a NULL pointer, then mStorage would update to be 1 by
SharedBuffer::data() if no pointer check here, which is an obviously
wrong address, and would cause corruption when used it e.g. in capacity().
So add the pointer check here for the return value of SharedBuffer::editResize,
if it's NULL do not use it to update mStorage, to avoid the value of mStorage
polluted.
2. when alloc or realloc falied in _grow & _shrink function, mStorage keep
the original value, so mCount should not be updated here.
Otherwise, mStorage might be 0 but mCount>0, so a corruption would happend
when it try to delete items from the Vector since mCount>0.
Change-Id: I7c3814e843c459834ca5eed392e8d63d1cb7d2d8
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Jian Luo <jian.luo@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 139626
2013-10-30 23:24:29 -07:00
Igor Murashkin
c20d479f0f
am d3beee64
: am e65b7ea8
: utils: Fix broken sdk build on windows
...
* commit 'd3beee649ffe7c2879b7b3616d33d6e813e28dbd':
utils: Fix broken sdk build on windows
2013-10-30 18:37:48 -07:00
Igor Murashkin
d3beee649f
am e65b7ea8
: utils: Fix broken sdk build on windows
...
* commit 'e65b7ea8801145626504c724c28aedd0e5038a28':
utils: Fix broken sdk build on windows
2013-10-30 18:35:39 -07:00
Igor Murashkin
e65b7ea880
utils: Fix broken sdk build on windows
...
Bug: 11324229
Change-Id: Ia50e79b5e2430faea77b0c98902e8e018fb9ceff
2013-10-30 18:09:52 -07:00
Igor Murashkin
1051c27dcf
am ce510d40
: am 81f2c3d2
: utils: Fix broken build
...
* commit 'ce510d40c209a627d06573a9b32f3e0eb941d3a4':
utils: Fix broken build
2013-10-30 16:19:01 -07:00
Igor Murashkin
ce510d40c2
am 81f2c3d2
: utils: Fix broken build
...
* commit '81f2c3d2117cfe7307ee6efbd82567bd02950965':
utils: Fix broken build
2013-10-30 16:15:57 -07:00
Igor Murashkin
81f2c3d211
utils: Fix broken build
...
Bug: 11324229
Change-Id: I7e4f514c5531e4c0c11bb0ba5d67e4dabbcd5792
2013-10-30 16:05:45 -07:00
Christopher Ferris
74160cb775
am 6b7b6541
: am b5c24e09
: am 8c58086c
: Merge "More libbacktrace fixes."
...
* commit '6b7b65417aead0189681c12d9162f31e8bc9b3e5':
More libbacktrace fixes.
2013-10-30 14:33:32 -07:00
Christopher Ferris
6b7b65417a
am b5c24e09
: am 8c58086c
: Merge "More libbacktrace fixes."
...
* commit 'b5c24e096d34e0f096d574f2aa799cd2dc6fc7db':
More libbacktrace fixes.
2013-10-30 14:31:48 -07:00
Christopher Ferris
b5c24e096d
am 8c58086c
: Merge "More libbacktrace fixes."
...
* commit '8c58086c54a23d33e915852a1355a171b09679cc':
More libbacktrace fixes.
2013-10-30 14:29:51 -07:00
Christopher Ferris
8c58086c54
Merge "More libbacktrace fixes."
2013-10-30 21:28:22 +00:00
Igor Murashkin
de2eae31b3
am 39f18c9e
: am 1b84e0a3
: Merge "utils: Add ProcessCallStack to collect stack traces for all threads in a process" into klp-dev
...
* commit '39f18c9ece973a0eaff7e982a120de63f31ee5c0':
utils: Add ProcessCallStack to collect stack traces for all threads in a process
2013-10-30 14:18:46 -07:00
Igor Murashkin
39f18c9ece
am 1b84e0a3
: Merge "utils: Add ProcessCallStack to collect stack traces for all threads in a process" into klp-dev
...
* commit '1b84e0a3145f1497fc2259608d8830f371526ece':
utils: Add ProcessCallStack to collect stack traces for all threads in a process
2013-10-30 14:16:18 -07:00
Christopher Ferris
8ed46278be
More libbacktrace fixes.
...
Included in minor fix ups is the addition of a warning macro to replace
all of the ALOGW calls.
Fix a race where multiple threads could be attempting to unwind the threads
of the current process at the same time.
Bug: 8410085
Change-Id: I02a65dc778dde690e5f95fc8ff069a32d0832fd1
2013-10-30 14:14:54 -07:00
Igor Murashkin
1b84e0a314
Merge "utils: Add ProcessCallStack to collect stack traces for all threads in a process" into klp-dev
2013-10-30 21:09:28 +00:00
Elliott Hughes
288ebfda3b
am 9259663c
: am f17f5591
: am 36d44740
: Merge "Fix a bunch of small system/core bugs."
...
* commit '9259663cdb8f15226844e3ecfc6e3aa53614ad03':
Fix a bunch of small system/core bugs.
2013-10-29 18:36:16 -07:00
Elliott Hughes
9259663cdb
am f17f5591
: am 36d44740
: Merge "Fix a bunch of small system/core bugs."
...
* commit 'f17f55914e18eb176ccc5bb8266b248ece8cb56b':
Fix a bunch of small system/core bugs.
2013-10-29 18:31:01 -07:00
Elliott Hughes
f17f55914e
am 36d44740
: Merge "Fix a bunch of small system/core bugs."
...
* commit '36d44740dd045403ae615b8dd6dac8b9a4e9f5bf':
Fix a bunch of small system/core bugs.
2013-10-29 14:29:26 -07:00
Elliott Hughes
36d44740dd
Merge "Fix a bunch of small system/core bugs."
2013-10-29 21:26:55 +00:00
Elliott Hughes
14e28d39f7
Fix a bunch of small system/core bugs.
...
Missing frees in:
adb/file_sync_client.c
fastboot/fastboot.c
libsparse/output_file.c
Missing closedirs in:
adb/file_sync_service.c
cpio/mkbootfs.c
libcutils/dir_hash.c
Potential buffer overrun in:
gpttool/gpttool.c
Incorrect NULL check in:
libsparse/backed_block.c
Bug: https://code.google.com/p/android/issues/detail?id=61564
Change-Id: If97838a9e73a77aef7f416c31c237ce1fca4ce21
2013-10-29 14:12:46 -07:00
Christopher Ferris
6996f91809
resolved conflicts for merge of 0433d622
to master
...
Change-Id: I6799c3fe8900ddcb2e9fe3032793dbb0996cf177
2013-10-29 13:56:52 -07:00
Christopher Ferris
0433d62291
am 0f26808e
: am 98f87d92
: Merge "Rewrite libbacktrace using C++."
...
* commit '0f26808e2c696f8bdcca644e0ddae2af9f753ada':
Rewrite libbacktrace using C++.
2013-10-29 13:27:54 -07:00
Christopher Ferris
0f26808e2c
am 98f87d92
: Merge "Rewrite libbacktrace using C++."
...
* commit '98f87d92d89079f274374409efcf57ca52b13c1f':
Rewrite libbacktrace using C++.
2013-10-29 13:25:06 -07:00
Christopher Ferris
98f87d92d8
Merge "Rewrite libbacktrace using C++."
2013-10-29 20:21:58 +00:00
Marco Nelissen
4067077a44
Merge "Add -n option to ps to print numeric uid"
2013-10-29 18:09:21 +00:00
Dmitry Shmidt
e2f32d05e6
libnl: Add nl_socket_set_nonblocking() function
...
Change-Id: I80fad954f588baf1af216ca6fe659d295233bbe5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-10-28 17:55:58 -07:00