Commit graph

2312 commits

Author SHA1 Message Date
Nick Kralevich
de35f2741c am 03752be0: am 0c297f5e: Merge "Revert "Fold uevent message origin checking from init into libcutils.""
* commit '03752be0a437d12e19ac73ebe23385fe6f756e2c':
  Revert "Fold uevent message origin checking from init into libcutils."
2011-04-27 10:35:06 -07:00
Nick Kralevich
03752be0a4 am 0c297f5e: Merge "Revert "Fold uevent message origin checking from init into libcutils.""
* commit '0c297f5ebb5ae7af2854f7c07d97bcdd13c159fc':
  Revert "Fold uevent message origin checking from init into libcutils."
2011-04-27 10:32:00 -07:00
Nick Kralevich
0c297f5ebb Merge "Revert "Fold uevent message origin checking from init into libcutils."" 2011-04-27 10:23:46 -07:00
Nick Kralevich
de9e65dd65 Revert "Fold uevent message origin checking from init into libcutils."
This reverts commit 8405ec0e75.

The original change does not compile.
2011-04-27 10:21:24 -07:00
Nick Kralevich
e3ab424570 am a7cf7ed9: am 282c2ab4: Merge "Fold uevent message origin checking from init into libcutils."
* commit 'a7cf7ed93486240ca48a407e67c7c3683a3b93aa':
  Fold uevent message origin checking from init into libcutils.
2011-04-27 09:59:14 -07:00
Nick Kralevich
02c8a9cf59 am 18f6d964: am f819d023: Merge "libsysutils: SocketListener: handle recv errors more gracefully."
* commit '18f6d964cbee483106da5c96a8c067a948324da7':
  libsysutils: SocketListener: handle recv errors more gracefully.
2011-04-27 09:55:31 -07:00
Nick Kralevich
a7cf7ed934 am 282c2ab4: Merge "Fold uevent message origin checking from init into libcutils."
* commit '282c2ab408d487d0995362d1b9aa97fe30d97ebd':
  Fold uevent message origin checking from init into libcutils.
2011-04-27 09:55:20 -07:00
Nick Kralevich
282c2ab408 Merge "Fold uevent message origin checking from init into libcutils." 2011-04-27 09:51:42 -07:00
Nick Kralevich
18f6d964cb am f819d023: Merge "libsysutils: SocketListener: handle recv errors more gracefully."
* commit 'f819d0233646668b06de36a787979e3b180d6c48':
  libsysutils: SocketListener: handle recv errors more gracefully.
2011-04-27 09:40:04 -07:00
Nick Kralevich
f819d02336 Merge "libsysutils: SocketListener: handle recv errors more gracefully." 2011-04-27 09:22:38 -07:00
Vernon Tang
8405ec0e75 Fold uevent message origin checking from init into libcutils.
Change-Id: I1a38e611a7ad990f74306ce453740a1eeed2416d
2011-04-27 14:17:15 +10:00
Vernon Tang
8795007a4a libsysutils: SocketListener: handle recv errors more gracefully.
Don't close the socket when onDataAvailable returns false if the socket
is connectionless.

Change-Id: Ie19497f5928144c463d92aa72ba517e675549ea6
2011-04-27 14:01:27 +10:00
Mike Lockwood
81ce51dae9 am 55537c34: am 2f7995ee: Merge "adb: fix typo in helptext"
* commit '55537c347bb31d0e2b176ca2550d2054877f9d54':
  adb: fix typo in helptext
2011-04-26 16:00:55 -07:00
Mike Lockwood
55537c347b am 2f7995ee: Merge "adb: fix typo in helptext"
* commit '2f7995ee0ff480b4ee06e8944e7d4569b59a5bad':
  adb: fix typo in helptext
2011-04-26 15:46:20 -07:00
Mike Lockwood
2f7995ee0f Merge "adb: fix typo in helptext" 2011-04-26 13:45:10 -07:00
David 'Digit' Turner
f315896f17 am 09bd79c1: am d068e5ae: Merge "pixelflinger: Provide more scanline shortcut functions."
* commit '09bd79c1c9f66f4b77969c3ec14bf62b29911ff5':
  pixelflinger: Provide more scanline shortcut functions.
2011-04-26 10:24:18 -07:00
Nick Kralevich
9285dc2511 am 4aadb7f6: (-s ours) am b620a0b1: Validate sender credentials on netlink msg receive
* commit '4aadb7f6df4fd21f66c37b8ac0ea8ebf939b41bf':
  Validate sender credentials on netlink msg receive
2011-04-26 10:24:16 -07:00
Bernhard Reutner-Fischer
6715a4390f adb: fix typo in helptext
s/ocmmand/command

Change-Id: I4ed17e8df9dc71a28e1caef5a21f6351e92628af
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
2011-04-26 12:53:55 +02:00
David 'Digit' Turner
09bd79c1c9 am d068e5ae: Merge "pixelflinger: Provide more scanline shortcut functions."
* commit 'd068e5aeb9992caa46a45275f7ff2ef73d3732a4':
  pixelflinger: Provide more scanline shortcut functions.
2011-04-26 00:43:01 -07:00
David 'Digit' Turner
d068e5aeb9 Merge "pixelflinger: Provide more scanline shortcut functions." 2011-04-25 23:25:15 -07:00
Nick Kralevich
a265e5a352 am d94bbc32: am 6bc08280: Validate sender credentials on netlink msg receive
* commit 'd94bbc326ab0e9ceca6f3f90a2864e40bb584c07':
  Validate sender credentials on netlink msg receive
2011-04-19 15:40:50 -07:00
Nick Kralevich
d94bbc326a am 6bc08280: Validate sender credentials on netlink msg receive
* commit '6bc08280108d020edfceff039f3955eebdc1e45c':
  Validate sender credentials on netlink msg receive
2011-04-19 15:37:03 -07:00
Nick Kralevich
6bc0828010 Validate sender credentials on netlink msg receive
Verify that netlink messages are actually from the kernel,
and not from a userspace program.

This is a manual cherry-pick from b620a0b1c7

Change-Id: I237f0a5cb56393bb3aab64a7ae5898f2bdc95cef
2011-04-19 12:33:44 -07:00
Nick Kralevich
4aadb7f6df am b620a0b1: Validate sender credentials on netlink msg receive
* commit 'b620a0b1c7ae486e979826200e8e441605b0a5d6':
  Validate sender credentials on netlink msg receive
2011-04-18 16:29:45 -07:00
Nick Kralevich
b620a0b1c7 Validate sender credentials on netlink msg receive
Verify that netlink messages are actually from the kernel,
and not from a userspace program.

Change-Id: I709c0efe9ba0258f6d79ebcde531d7f7bbe780b2
2011-04-18 15:55:59 -07:00
David 'Digit' Turner
39764f41a5 pixelflinger: Provide more scanline shortcut functions.
This patch adds a dozen more "shortcut" scanline-processing functions
to pixel-flingers. All of them avoid using the JIT for the corresponding
operation (on ARM), or using the generic and _extremely_ slow 'scanline'
function (on x86, where there is no JIT).

The shortcuts were selected by running the system under emulation
(build full_x86-eng, then launch emulator-x86), and correspond to
operations that are in use when using the system's typical UI features.

This makes it much more responsive and amenable to testing most
applications, at least those that don't use OpenGL ES heavily.

Note that HW OpenGLES emulation is under completion and should solve this
problem entirely, though is not there yet.

Change-Id: I9c73ba21ad158d6cc5532fabe7ed2419e00ecb3f
2011-04-16 13:13:58 +02: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
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
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
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
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
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
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
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
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
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
Ken Sumrall
b26662c0a2 am c3e69903: am 97919656: Add support for the utime(2) family of system calls to the sdcard fuse filesystem.
* commit 'c3e69903ed5f9e406fe51093fc41917512aa4036':
  Add support for the utime(2) family of system calls to the sdcard fuse filesystem.
2011-03-24 22:35:37 -07:00
Ken Sumrall
c3e69903ed am 97919656: Add support for the utime(2) family of system calls to the sdcard fuse filesystem.
* commit '97919656803126c6b28ea6070fc86d124ac4ef4b':
  Add support for the utime(2) family of system calls to the sdcard fuse filesystem.
2011-03-24 22:33:18 -07:00