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
Elliott Hughes
37cc29e956
resolved conflicts for merge of 9ff588f8
to klp-dev-plus-aosp
...
Change-Id: I0250174055a16bc2d35ede1f6a0a7f033bb3c844
2013-10-18 17:56:50 -07:00
Elliott Hughes
9ff588f84b
am f1296b9e
: Merge "Use %zd for size_t."
...
* commit 'f1296b9e92cb04f9bba8c622560d37dfc53c7aa4':
Use %zd for size_t.
2013-10-18 17:40:26 -07:00
Elliott Hughes
f1296b9e92
Merge "Use %zd for size_t."
2013-10-19 00:38:07 +00:00
Elliott Hughes
9640b30dd7
Use %zd for size_t.
...
Change-Id: I0139243c309e85236eb00bb471736bdd99eeec84
2013-10-18 17:11:00 -07:00
Scott Anderson
7d0c73cb8d
Merge "Enhance the ioctl toolbox command"
2013-10-18 18:15:32 +00:00
Jeff Sharkey
fb7e395455
am 9b41f452
: am a9e453f1
: Merge "vold no longer does MS_MOVE; remove tmpfs." into klp-dev
...
* commit '9b41f452013123d0a394e696f597467da73108ed':
vold no longer does MS_MOVE; remove tmpfs.
2013-10-17 18:50:43 -07:00
Jeff Sharkey
9b41f45201
am a9e453f1
: Merge "vold no longer does MS_MOVE; remove tmpfs." into klp-dev
...
* commit 'a9e453f1b552699f69dca19599c7624a581089bd':
vold no longer does MS_MOVE; remove tmpfs.
2013-10-17 18:48:45 -07:00
Jeff Sharkey
a9e453f1b5
Merge "vold no longer does MS_MOVE; remove tmpfs." into klp-dev
2013-10-18 01:45:05 +00:00
Scott Anderson
9e97fee019
Enhance the ioctl toolbox command
...
1) Implement documented but unimplemented read-only option.
2) Allow standard input to be used as the <device> by passing
"-". On some devices, opening the device has side effects.
Allowing standard input can prevent this by using a sequence
of something like:
# Open the device on file descriptor 3
exec 3<> /dev/something
ioctl -d - 0 0 <&3
ioctl -d - 1 0 <&3
dd if=myfile >&3
# Close file descriptor 3
exec 3>&-
Change-Id: If17ac3cffa7ccb159051550724b4ce7d8efa5feb
Signed-off-by: Scott Anderson <saa@android.com>
2013-10-17 17:20:37 -07:00
Jeff Sharkey
00c8e1a219
vold no longer does MS_MOVE; remove tmpfs.
...
MS_MOVE was used when staging external storage devices, which no
longer occurs. In fact, having a writable tmpfs was masking a vold
bug around moving apps to SD cards.
Bug: 11175082
Change-Id: Ib2d7561c3a0b6fde94f651a496cb0c1f12f88d96
2013-10-17 16:47:20 -07:00
JP Abgrall
031120e807
am e6cc5659
: am 9c39c96a
: am b387a7f2
: Merge "Wait for device to disappear after reboot-bootloader."
...
* commit 'e6cc565990f5281d2b2bdd02518ef7482473b9c4':
Wait for device to disappear after reboot-bootloader.
2013-10-17 14:40:37 -07:00
JP Abgrall
e6cc565990
am 9c39c96a
: am b387a7f2
: Merge "Wait for device to disappear after reboot-bootloader."
...
* commit '9c39c96a524def86d4aeba9cbfe7c7fe717e20e3':
Wait for device to disappear after reboot-bootloader.
2013-10-17 13:12:46 -07:00
JP Abgrall
9c39c96a52
am b387a7f2
: Merge "Wait for device to disappear after reboot-bootloader."
...
* commit 'b387a7f2168a720fa486f31e8f3189114f69c0db':
Wait for device to disappear after reboot-bootloader.
2013-10-17 13:09:56 -07:00
JP Abgrall
b387a7f216
Merge "Wait for device to disappear after reboot-bootloader."
2013-10-17 20:07:05 +00:00
Mark Wachsler
157b00171a
Wait for device to disappear after reboot-bootloader.
...
(Linux only for now) With fastboot reading serial numbers from sysfs, it had
become possible for a fastboot command issued immediately after rebooting
the bootloader to fail, because sysfs still thought the device was online.
To prevent this, after reboot-bootloader we wait for the device to disconnect.
Also made usb_read and usb_write fail immediately if the descriptor has been
closed; this prevents an incorrect error message ("Bad file descriptor")
when errors from fb_getvar are ignored (e.g., by fb_format_supported).
Also removed unused fd param from filter_usb_device, and simplified logic
in usb_write by using do/while instead of a special case for len == 0.
Change-Id: I799b857eab411fd8ad25f5777fc61c685152ea86
2013-10-17 20:06:32 +00:00
JP Abgrall
8ac7c9f659
am 308f0f9b
: am 95e69261
: am ac568b8f
: Merge "init: remove obsolete rle logo"
...
* commit '308f0f9bf2a82d9c1e02982f0e177f6b04545210':
init: remove obsolete rle logo
2013-10-17 09:50:44 -07:00
JP Abgrall
308f0f9bf2
am 95e69261
: am ac568b8f
: Merge "init: remove obsolete rle logo"
...
* commit '95e69261b22cd57c795e96e5ac122f120113f819':
init: remove obsolete rle logo
2013-10-17 09:46:10 -07:00
JP Abgrall
95e69261b2
am ac568b8f
: Merge "init: remove obsolete rle logo"
...
* commit 'ac568b8f783ee60a7a2cb0ab5b6db786bdb39b35':
init: remove obsolete rle logo
2013-10-17 09:44:35 -07:00
JP Abgrall
ac568b8f78
Merge "init: remove obsolete rle logo"
2013-10-17 16:42:15 +00:00