Carl Shapiro
f098c159e3
Merge "Make atomic-inline.h usable from ordinary C++ code."
2011-04-12 16:13:36 -07:00
Carl Shapiro
b60d9ce1fc
Make atomic-inline.h usable from ordinary C++ code.
...
Change-Id: I18dcba9cb3adc22f26403e94df4b2684f51090ed
2011-04-11 20:00:42 -07:00
Jake Hamby
6f49d5f266
Add missing function required to load Crespo RIL library.
...
ifc_set_mask() function was removed in a previous change. This function
is called by the Crespo RIL, so we can't remove it yet.
Bug: 4268537
Change-Id: I634580ee8d2a1aff069178837cc121c89c5e73f9
2011-04-11 19:46:41 -07:00
Mike Lockwood
203f9513fd
am 0ffe483a: am e4bcf830: am d37e0840: Merge "In serial, skip over port as well if numbers found after colon."
...
* commit '0ffe483a6a9191fc6da031bbcdbdc50f6f64bdf0':
In serial, skip over port as well if numbers found after colon.
2011-04-11 15:08:00 -07:00
Ken Sumrall
91758c1746
Merge "Add the touch command to toolbox."
2011-04-11 15:03:29 -07:00
Mike Lockwood
0ffe483a6a
am e4bcf830: am d37e0840: Merge "In serial, skip over port as well if numbers found after colon."
...
* commit 'e4bcf8305748e8799df9047fb0f6881553dd43b5':
In serial, skip over port as well if numbers found after colon.
2011-04-11 14:55:01 -07:00
Brian Carlstrom
6541ef1562
Add keychain user
...
Change-Id: Id6738d7c97dd58b2043e2cba018797e3b2b4d77a
2011-04-08 14:06:16 -07:00
Mike Lockwood
e4bcf83057
am d37e0840: Merge "In serial, skip over port as well if numbers found after colon."
...
* commit 'd37e0840d75ef133083181f9f95dff9aa46a1b16':
In serial, skip over port as well if numbers found after colon.
2011-04-06 07:55:00 -07:00
Mike Lockwood
d37e0840d7
Merge "In serial, skip over port as well if numbers found after colon."
2011-04-06 07:25:31 -07:00
Terence Haddock
e994f18c53
In serial, skip over port as well if numbers found after colon.
...
Change-Id: Icd45f570a9527790eb0cd614a3f77da1a72375b1
2011-04-06 16:18:25 +02:00
Ken Sumrall
795165bc15
Add the touch command to toolbox.
...
I wrote this to test my fix to support utime(2) system calls in the
sdcard fuse filesystem for stingray, and decided to finish sprucing
it up and make it part of toolbox. In an effort to keep it small,
it doesn't accept dates a la touch, but just a time_t value.
Change-Id: I5dd011cd2e34d0cc605d6f40e46b96a8c949f194
2011-04-05 20:50:03 -07:00
Jeff Hamilton
18247d74be
am ee3420bc: resolved conflicts for merge of 65475f89
to honeycomb-plus-aosp
...
* commit 'ee3420bc124613827af474684c3015d12742c70d':
Make the NFC UID forward compatible.
2011-04-05 10:42:19 -07:00
Jeff Hamilton
ee3420bc12
resolved conflicts for merge of 65475f89
to honeycomb-plus-aosp
...
Change-Id: I9f77e84d887dbe84bb94de0fdd369d8de24fbec3
2011-04-05 12:32:50 -05:00
Wink Saville
32e834b63b
am b6623abc: am b98762f7: Teach fastboot to allow required variables per product.
...
* commit 'b6623abc414ea2a1d1ac3cbfef0c435e3b7e8987':
Teach fastboot to allow required variables per product.
2011-04-05 10:28:28 -07:00
Wink Saville
b6623abc41
am b98762f7: Teach fastboot to allow required variables per product.
...
* commit 'b98762f7824c291dc5d9a9b757af434ef31d8c81':
Teach fastboot to allow required variables per product.
2011-04-04 19:36:27 -07:00
Wink Saville
b98762f782
Teach fastboot to allow required variables per product.
...
This is needed for products like xoom-cdma and xoom-cdma-lte.
The xoom-cdma-lte product requires an lte baseband binary but
it's not needed for xoom-cdma.
This is implemented by allowing an optional product parameter
to "required" statements. The parameter is separated from
"required" by a colon so the version-baseband-2 requirment in
board-info.txt for stingray becomes:
require-for-product:xoom-cdma-lte version-baseband-2=ltedc_u_03.25.00|ltedc_u_03.19.00
In the above statement, only xoom-cdma-lte requires version-baseband-2
and the baseband can be lte_u_03.25.00 or lte_u_03.19.00. For other
products version-baseband-2 will be ignored.
Change-Id: I786bec5f5661c2243d87925b064fc6124d3cffa1
2011-04-04 17:54:59 -07:00
Jeff Hamilton
65475f89e1
am 336bc321: Make the NFC UID forward compatible.
...
* commit '336bc321a6e978a273098148e13a82c5e7ec3be5':
Make the NFC UID forward compatible.
2011-04-04 14:42:38 -07:00
Brad Fitzpatrick
d6efa45489
am 80337ffc: am 47e4ee59: am 71ead183: Close the client socket early for ctl.* properties.
...
* commit '80337ffcf45205750b8b90cbbe28c4c8e7e2baff':
Close the client socket early for ctl.* properties.
2011-04-01 12:27:04 -07:00
Brad Fitzpatrick
80337ffcf4
am 47e4ee59: am 71ead183: Close the client socket early for ctl.* properties.
...
* commit '47e4ee5958bfd48c741f17c23b3a4a3f7866416e':
Close the client socket early for ctl.* properties.
2011-04-01 12:25:46 -07:00
Brad Fitzpatrick
47e4ee5958
am 71ead183: Close the client socket early for ctl.* properties.
...
* commit '71ead1835317af5305f9ef87ce06ebdf9cff92e6':
Close the client socket early for ctl.* properties.
2011-04-01 12:24:10 -07:00
Brad Fitzpatrick
71ead18353
Close the client socket early for ctl.* properties.
...
Bug: 4199411
Change-Id: I3bf335e16e0df8405c538989a8f4f6db7795fa36
2011-04-01 12:00:35 -07:00
Jeff Hamilton
336bc321a6
Make the NFC UID forward compatible.
...
Change-Id: Icfa302c22151b3d722ad0da7e58806f74730e1a3
2011-04-01 13:43:01 -05:00
Colin Cross
ab0c4e0356
Merge "ueventd: track platform device uevents to parse block device names"
2011-03-31 17:01:26 -07:00
Colin Cross
320cbfa719
Merge "ueventd: refactor uevent handling"
2011-03-31 17:01:13 -07:00
Colin Cross
fadb85e3bd
ueventd: track platform device uevents to parse block device names
...
The mmc block devices on panda boards use a platform device called
omap/omap_hsmmc.0. The number of path entries in the uevent after
the platform device is unknown, and the number of path entries in
the platform device is unknown, so the only way to determine how
many entries make up the platform device is to compare against
a list of platform devices.
Add a list of platform devices that have been registered, and
iterate through it to determine the platform device portion of
a block device uevent.
Change-Id: I1480bc6429172ca6997d548787be3863ce062472
2011-03-31 16:44:04 -07:00
Colin Cross
eb5ba83065
ueventd: refactor uevent handling
...
Change-Id: I2002be3580ff87b0a55dc030a9099bf6d795011f
2011-03-31 16:37:20 -07:00
Lorenzo Colitti
7b43eb1224
am e9fa47ca: am 0dd572a5: Merge "Kill IPv6 sockets as well as IPv4 sockets." into honeycomb-LTE
...
* commit 'e9fa47ca664577e4ca7ed270f1f72a2d43fb3423':
Kill IPv6 sockets as well as IPv4 sockets.
2011-03-30 17:36:37 -07:00
Lorenzo Colitti
e9fa47ca66
am 0dd572a5: Merge "Kill IPv6 sockets as well as IPv4 sockets." into honeycomb-LTE
...
* commit '0dd572a5196f7887de56912b6f2a22f053f1ca34':
Kill IPv6 sockets as well as IPv4 sockets.
2011-03-30 17:34:30 -07:00
Lorenzo Colitti
0dd572a519
Merge "Kill IPv6 sockets as well as IPv4 sockets." into honeycomb-LTE
2011-03-30 17:26:15 -07:00
Brad Fitzpatrick
a8bf832462
am 719e4048: am 9cbac1fc: am 9f1e0e3a: Close the property socket *after* updating properties.
...
* commit '719e40484fa13ecd0b1645c7a7a5d01d5845731a':
Close the property socket *after* updating properties.
2011-03-30 16:41:33 -07:00
Jeff Hamilton
124d1931ba
am 99f28ca6: am be61f39a: (-s ours) am a6a36c0b: Update the value for the NFC shared UID.
...
* commit '99f28ca6ddc4c1010ecac7420fb23dd8038c8abc':
Update the value for the NFC shared UID.
2011-03-30 16:33:43 -07:00
Brad Fitzpatrick
719e40484f
am 9cbac1fc: am 9f1e0e3a: Close the property socket *after* updating properties.
...
* commit '9cbac1fc0bb5e521e3e017542ca8b6477504fce7':
Close the property socket *after* updating properties.
2011-03-30 15:48:32 -07:00
Brad Fitzpatrick
9cbac1fc0b
am 9f1e0e3a: Close the property socket *after* updating properties.
...
* commit '9f1e0e3ae3108086948b74ce58af32df92ff8331':
Close the property socket *after* updating properties.
2011-03-30 15:46:28 -07:00
Brad Fitzpatrick
9f1e0e3ae3
Close the property socket *after* updating properties.
...
Also remove some dead code.
Bionic update is in change I3e80cecf
Bug: 4185486
Change-Id: I28e06197ff7a452c70b89b9fc5e2bcf0d9d54bbe
2011-03-30 15:27:03 -07:00
Brad Fitzpatrick
0b6f563442
Merge "Close the property socket *after* updating properties."
2011-03-30 14:48:37 -07:00
Brad Fitzpatrick
8ec49049da
Close the property socket *after* updating properties.
...
Also remove some dead code.
Bionic update is in change I3e80cecf
Bug: 4185486
Change-Id: I8dd685eaea1a927c1659df5a1228cc259227ad1c
2011-03-30 14:18:25 -07:00
Jeff Hamilton
99f28ca6dd
am be61f39a: (-s ours) am a6a36c0b: Update the value for the NFC shared UID.
...
* commit 'be61f39a6b3b92fd6f0a9d1e732f59fa08e95da6':
Update the value for the NFC shared UID.
2011-03-30 08:19:33 -07:00
Alexandre Elias
412514ea60
Add ifndef guards to remaining logging macros.
...
Change-Id: I5fce9bffdb9e52d50059034fd1cc05ba7f0e3b87
2011-03-29 16:24:45 -07:00
JP Abgrall
b40367e7bc
adb: keep mac build happy
...
Use FIONREAD instead of TIOCINQ
Change-Id: Ic9db0228a51c546a798c70f08f2e644a1a376120
2011-03-29 12:36:22 -07:00
JP Abgrall
bab2c6a883
Merge "adb: fix subprocess exit handling, oom adjust fixes, extra debugging."
2011-03-29 11:09:18 -07:00
Brad Fitzpatrick
97d81766fd
am 4fecade5: am cb1e616e: am 7c556549: Merge changes Icdefb5ff,Icd7f5f03
...
* commit '4fecade5f21d5d062ebe1c70535367d3407bb68f':
Fix potential race introduced in Icd7f5f03
SocketClient: add optional reference counting
2011-03-29 08:52:56 -07:00
Brad Fitzpatrick
471bfa78ff
am 15b15c4b: am a14da5b1: am 499b45a3: Merge "libsysutils: Fix a file descriptor leak."
...
* commit '15b15c4b4acede0b999e6a7af9ce797c6a58a62a':
libsysutils: Fix a file descriptor leak.
2011-03-29 08:52:53 -07:00
Brad Fitzpatrick
a39cd620f3
am 34859033: am fdb915d2: (-s ours) am 4593e0a7: Merge "libsysutils: Fix race condition in SocketListener thread."
...
* commit '34859033c1076f23d958349b86cb0a5d42696745':
libsysutils: Fix race condition in SocketListener thread.
2011-03-29 08:52:51 -07:00
Brad Fitzpatrick
4fecade5f2
am cb1e616e: am 7c556549: Merge changes Icdefb5ff,Icd7f5f03
...
* commit 'cb1e616e3c108a9c8b159bb95c3356acf5797ba2':
Fix potential race introduced in Icd7f5f03
SocketClient: add optional reference counting
2011-03-29 08:45:04 -07:00
Brad Fitzpatrick
15b15c4b4a
am a14da5b1: am 499b45a3: Merge "libsysutils: Fix a file descriptor leak."
...
* commit 'a14da5b1e5c956dc90d8725ab6b68311f66e6b6a':
libsysutils: Fix a file descriptor leak.
2011-03-29 08:45:02 -07:00
Brad Fitzpatrick
34859033c1
am fdb915d2: (-s ours) am 4593e0a7: Merge "libsysutils: Fix race condition in SocketListener thread."
...
* commit 'fdb915d2569b73312e7ab8cb0c0556a3c3d1310a':
libsysutils: Fix race condition in SocketListener thread.
2011-03-29 08:44:59 -07:00
Brad Fitzpatrick
a6d6a6d8be
am ff904188: am df424691: am 0e59123a: Merge "libsysutils: Handle EINTR in SocketClient::sendData()"
...
* commit 'ff90418888631b2d0b195657b00da55b9d7edcd1':
libsysutils: Handle EINTR in SocketClient::sendData()
2011-03-28 17:43:48 -07:00
Brad Fitzpatrick
ff90418888
am df424691: am 0e59123a: Merge "libsysutils: Handle EINTR in SocketClient::sendData()"
...
* commit 'df42469121211905532c5c6d7aa95ec392a7eb35':
libsysutils: Handle EINTR in SocketClient::sendData()
2011-03-28 17:41:29 -07:00
JP Abgrall
408fa57864
adb: fix subprocess exit handling, oom adjust fixes, extra debugging.
...
* Add support for correctly handling subprocess termination in shell service (b/3400254 b/3482112 b/2249397)
- have a waitpid() track the subprocess, then notify the fdevent via a socket
- force an eof on the pty master in fdevent's new subproc handler.
- modify fdevent to force-read the pty after an exit.
* Migrate the "shell:blabla" handling to "#if !ADB_HOST" sections, where it
belongs.
* Fix the race around OOM adjusting.
- Do it in the child before exec() instead of the in the parent as the
child could already have started or not (no /proc/pid/... yet).
* Allow for multi-threaded D() invocations to not clobber each other.
- Allow locks across object files.
- Add lock within D()
- Make sure sysdesp init (mutex init also) is called early.
* Add some missing close(fd) calls
- Match similar existing practices near dup2()
* Add extra D() invocations related to FD handling.
* Warn about using debugging as stderr/stdout is used for protocol.
* Fix some errno handling and make D() correctly handle it.
* Add new adb trace_mask: services.
* Make fdevent_loop's handle BADFDs more gracefully (could occur some subproc closed its pts explicitely).
* Remove obsolete commandline args reported in help. (b/3509092)
Change-Id: I928287fdf4f1a86777e22ce105f9581685f46e35
2011-03-28 14:12:22 -07:00
Brian Swetland
cdae7a1df8
Merge "defer firmware load until after filesystems are mounted"
2011-03-25 13:00:43 -07:00