Commit Graph

6684 Commits

Author SHA1 Message Date
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
Christopher Ferris 17e91d44ed Rewrite libbacktrace using C++.
The old code was essentially trying to be C++ in C and was awkward. This
change makes it all objects with a thin layer that C code can use.

There is a C++ backtrace object that is not very useful, this code will
replace it.

This change also includes moving the backtrace test to a gtest, and adding
coverage of all major functionality.

Bug: 8410085
Change-Id: Iae0f1b09b3dd60395f71ed66010c1ea5cdd37841
2013-10-28 17:55:25 -07:00
Brian Carlstrom fd4d0de575 am 406abdc8: am 5dadac50: am 87af04a4: Merge "Improve some adb error logging"
* commit '406abdc8a2b68df77ab30836826f642c2ef37bda':
  Improve some adb error logging
2013-10-28 14:33:57 -07:00
Brian Carlstrom 406abdc8a2 am 5dadac50: am 87af04a4: Merge "Improve some adb error logging"
* commit '5dadac50c4bbeaf8baf4d5e04c2d2706d9e74fc7':
  Improve some adb error logging
2013-10-28 14:30:26 -07:00
Brian Carlstrom 5dadac50c4 am 87af04a4: Merge "Improve some adb error logging"
* commit '87af04a42ec2d959cced0f1c01888f9cf3b2b9c5':
  Improve some adb error logging
2013-10-28 14:27:33 -07:00
Brian Carlstrom 87af04a42e Merge "Improve some adb error logging" 2013-10-28 21:24:51 +00:00
Brian Carlstrom 93c91fad77 Improve some adb error logging
Bug: 11290643
Change-Id: Ibad4e9f0b69421cd6017b70a52237e7f27aab848
2013-10-27 16:56:55 -07:00
Igor Murashkin ec79ef2e7b utils: Add ProcessCallStack to collect stack traces for all threads in a process
- Also add a Printer class (print lines to logcat, fd, or strings)

Bug: 11324229
Change-Id: I78435ed49aa196a0efb45bf9b2d58b62c41737d3
2013-10-25 19:24:56 -07:00
Marco Nelissen 377cb2ab3a Add -n option to ps to print numeric uid
and fix some whitespace issues

Change-Id: Iefb6f51f5f4522ce4ab0f1ea3c996fe892715e90
2013-10-25 08:15:42 -07:00
Nick Kralevich 866977526c am 0bf7924d: am 91704522: Don\'t return immediately from reboot commands.
* commit '0bf7924df19f72258df7b553515bfbc9574d0114':
  Don't return immediately from reboot commands.
2013-10-24 12:45:13 -07:00
Elliott Hughes 2092680f86 am 396f6b77: am c3d04aab: am 4d87e743: Merge "Eliminate text relocations in x86 optimized memset versions"
* commit '396f6b7771688c5aeb72138fff4d9415e31ae1da':
  Eliminate text relocations in x86 optimized memset versions
2013-10-24 12:40:21 -07:00
Nick Kralevich 0bf7924df1 am 91704522: Don\'t return immediately from reboot commands.
* commit '917045222a69021eb36aea96708649c709685509':
  Don't return immediately from reboot commands.
2013-10-24 12:39:29 -07:00
Elliott Hughes 396f6b7771 am c3d04aab: am 4d87e743: Merge "Eliminate text relocations in x86 optimized memset versions"
* commit 'c3d04aab960c81a746579d67a17049d8f4efba9a':
  Eliminate text relocations in x86 optimized memset versions
2013-10-24 12:37:01 -07:00
Elliott Hughes c3d04aab96 am 4d87e743: Merge "Eliminate text relocations in x86 optimized memset versions"
* commit '4d87e743083c201edd0b565dd7d42e70945a6265':
  Eliminate text relocations in x86 optimized memset versions
2013-10-24 12:33:40 -07:00
Elliott Hughes 4d87e74308 Merge "Eliminate text relocations in x86 optimized memset versions" 2013-10-24 18:17:21 +00:00
Nick Kralevich 917045222a Don't return immediately from reboot commands.
The reboot commands return too fast, interfering with testing.
Add a pause(), which will allow the device time to complete the
reboot.

Change-Id: Ie9cc6eea67b7ff662ec71ea2329cbb94f8d55404
Bug: 11369303
2013-10-24 11:01:16 -07:00
Pavel Chupin 9ff8767bc6 Eliminate text relocations in x86 optimized memset versions
Change-Id: Ieb72af8cf7f93210a68a87b1e2538deb5642f4d5
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-10-24 21:42:30 +04:00
Todd Poynor c15e993467 healthd: remove/rearrange extra battery property handling
Change-Id: I6cc1570e23c1c1468f08579f633997e95327347a
2013-10-22 18:21:27 -07:00
Todd Poynor 9b53cf79af healthd: remove service batterypropreg
Change-Id: Iac24af6a59453686fca145d0814dc5ff045efcec
2013-10-22 17:56:21 -07:00
Todd Poynor f0e2ac2642 healthd: rename service batterypropreg => batteryproperties
Part 1 of 2 (to avoid transitory runtime crashes).

Change-Id: I40d990ef7ee18cea99e5add39738bbe9fd5701ca
2013-10-22 17:50:59 -07:00
Todd Poynor 020369d872 healthd: BatteryService dumpstate support
Change-Id: Ia6938b7126751801310632c995af0f96e41f5f64
2013-10-22 16:32:54 -07:00
Todd Poynor 6dcc45ed6d healthd: Fixups for systems without batteries or removable batteries
* Replace unnecessary warnings about missing attributes with a more
  informative message when no battery devices provided by the system.

* Turn off periodic battery checks when no battery devices (thereby
  reducing unnecessary kernel log spam).

* Replace battery properties in log messages with a more informative
  message when no battery is provided or the battery is removed.

Change-Id: I68a514aa7315ae2b5d22cb8861d3c9b1b38035a1
2013-10-22 11:15:50 -07:00
Elliott Hughes 83dfaa8853 am 37cc29e9: resolved conflicts for merge of 9ff588f8 to klp-dev-plus-aosp
* commit '37cc29e95684de126693f59e91703b2af57e7659':
  Use %zd for size_t.
2013-10-18 17:59:55 -07:00