Commit graph

273 commits

Author SHA1 Message Date
Jeff Hamilton
ee3420bc12 resolved conflicts for merge of 65475f89 to honeycomb-plus-aosp
Change-Id: I9f77e84d887dbe84bb94de0fdd369d8de24fbec3
2011-04-05 12:32:50 -05: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
Jeff Hamilton
336bc321a6 Make the NFC UID forward compatible.
Change-Id: Icfa302c22151b3d722ad0da7e58806f74730e1a3
2011-04-01 13:43:01 -05: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
Jeff Hamilton
be61f39a6b am a6a36c0b: Update the value for the NFC shared UID.
* commit 'a6a36c0b799b84d06b695027d205f21d13a3275b':
  Update the value for the NFC shared UID.
2011-03-24 20:23:35 -07:00
Jeff Hamilton
a6a36c0b79 Update the value for the NFC shared UID.
Change-Id: I47edf39dbdf2ebd41f44ca69aac250d8991dec4c
2011-03-24 21:40:43 -05:00
Brad Fitzpatrick
3549b0dc28 Fix potential race introduced in Icd7f5f03
Digit wrote:

"You probably don't want to close the socket here without updating
c->socket as well. Otherwise, another thread holding a handle to the
client after the c->decRef() could end up sending a message to a
different socket, if the file descriptor index is reused by another
client in the meantime."

Change-Id: Icdefb5ffc0c7607325d7db761e1f04e5d868bfb7
2011-03-22 14:03:11 -07:00
Brad Fitzpatrick
13aa8ad445 SocketClient: add optional reference counting
Needed to fix a race in netd.

Bug: 3438459
Change-Id: Icd7f5f035510235f733a25c0621479d3e644b152
2011-03-22 14:03:08 -07:00
David 'Digit' Turner
100c0e2dab libsysutils: Fix race condition in SocketListener thread.
+ Handle EINTR in accept(), write() and select()
+ Fix a memory leak when deleting the mClients list
+ Fix typo in SocketListener.h

Change-Id: Ie68bb3e2dbefe0dfdaa22a5cd06a42dbc4c0f8aa
2011-03-22 14:02:51 -07:00
Ken Sumrall
e3aeeb4de3 Try to unmount writable filesystems when rebooting
Ext4 filesystems like to be unmounted before rebooting.  The Android system
doesn't have a traditional Linux init setup, and shutting down the system
was not much more than calling sync(2) and reboot(2).  This adds a new
function to libcutils called android_reboot().  By default, it calls sync()
and then remounts all writable filesystems as read-only and marks them clean.
There is a flag parameter in which the caller can ask for sync() not to be
called, or to not remount the filesystems as read-only.  Then it will call
reboot(2) as directed by the other parameters.  This change also updates
adb, init and toolbox to call the new android_reboot() function.
Fixes bugs 3350709 and 3495575.

Change-Id: I16d71ffce3134310d7a260f61ec6f4dd204124a7
2011-03-10 18:11:46 -08:00
Raphael Moll
879dd27b2b am e24624da: am 733e4701: am fa5f2ad4: am bd8f4a85: Merge "Define O_BINARY for non-Windows platforms."
* commit 'e24624da7d29374ad59d20312ca0e0ea2ea5596b':
  Define O_BINARY for non-Windows platforms.
2011-03-02 15:33:12 -08:00
Raphael Moll
e24624da7d am 733e4701: am fa5f2ad4: am bd8f4a85: Merge "Define O_BINARY for non-Windows platforms."
* commit '733e47011023787cf996b1b4f232453b2324e303':
  Define O_BINARY for non-Windows platforms.
2011-03-02 11:38:35 -08:00
Brad Fitzpatrick
8d1c6e7685 Make optional valgrind binaries +x.
Change-Id: If3417e0c8728c7c74badb12de734cf06e794619d
2011-03-01 15:12:11 -08:00
Raphael Moll
bd70e4aca5 Define O_BINARY for non-Windows platforms.
All tools (aapt, aidl, dexdump, etc.) need this flag to open()
binary files, or they risk reading corrupted data on Windows.

A bunch of these tools just conditionaly define O_BINARY in
their C files. Seems it would just make sense to define it globally.

Change-Id: Ia5c0a59e9e77bbdcbce235233555f611207abed8
2011-02-16 13:36:42 -08:00
Mike Lockwood
b5d68a3c28 libusbhost: Save endpoint ID in usb_request struct
Change-Id: I2cf189cee67c2efbcf919c8bae1447a6cb112f02
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-14 08:05:40 -05:00
Paul Eastham
4fe0bc5cf6 am 57cd87d9: am 1ace223f: Set default permissions for preloaded /data/media aka /sdcard content.
* commit '57cd87d9ccf57a2c874fafd1a0b8cab7ebea646f':
  Set default permissions for preloaded /data/media aka /sdcard content.
2011-02-07 11:38:50 -08:00
Paul Eastham
1ace223fcb Set default permissions for preloaded /data/media aka /sdcard content.
Change-Id: Ia67cbdbfbcd423cf163f0fce5c6edc215564e782
2011-02-03 17:14:00 -08:00
Robert Greenwalt
09dd819d27 Stop using netmask in the framework
This pushes prefixLength down as far as we can.

bug:2542681
Change-Id: I94b7cde9d10e97ee2c071d92f25555cff5934f0b
2011-02-02 14:18:44 -08:00
Mike Lockwood
120b57a3d9 libusbhost: Add call for synchronous bulk transfers
Also clean up and add timeout to control request transfer

Change-Id: Ibc2d8ac64d0fa90e0a23e6225ce2c49b23bb0d97
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-27 16:21:56 -08:00
Dmitry Shmidt
b42db825e1 Merge "libnetutils: Clean all IPs assigned to the interface on cleaning" 2011-01-27 15:59:52 -08:00
Dmitry Shmidt
9092b91cca libnetutils: Clean all IPs assigned to the interface on cleaning
Change-Id: Ic285bbb4b224fc4e62e88e76b8b448edbe814a17
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-01-27 14:16:20 -08:00
Robert Greenwalt
faab26d542 Change our dhcp interface to be IPv6 compat.
Doesn't do IPv6, but removes v4-specific structures from the framework
(netmask, ints for addrs)
bug:2542681

Change-Id: I1110e6f32d42a472b104835a4298e18b391db0a7
2011-01-25 11:21:04 -08:00
Carl Shapiro
f59ed65c47 am 3b093369: am 1147407b: Merge "Remove unconditional swap from the android atomic operations suite." into honeycomb
* commit '3b093369d85f2d248799073152ece79987d4b30b':
  Remove unconditional swap from the android atomic operations suite.
2011-01-24 16:46:45 -08:00
Carl Shapiro
0a16d83969 Remove unconditional swap from the android atomic operations suite.
Bug: 3381237
Change-Id: I7bdc7c8eb4c1cc6303d96e40ca2f196a007c4dd2
2011-01-23 14:09:17 -08:00
Glenn Kasten
328c0d4a89 Merge "Bug 3361124 Remove drmioserver" 2011-01-23 09:45:24 -08:00
Mike Lockwood
ec9e7b1c18 libusbhost: Add usb_device_connect_kernel_driver()
This can be used to ask the kernel to disconnect its driver for a device
so usb_device_claim_interface() can claim it instead.

Also increased size of descriptor buffer and added some debugging logs

Change-Id: I4945196d957fb8493716eb9b7e5463c06b168ef1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-22 14:10:04 -08:00
Glenn Kasten
b29b33841b Bug 3361124 Remove drmioserver
Change-Id: Ie3b20b487c1466737921567ab2d043e230356bf4
Note: safe to re-use the drmio uid/gid as no files were ever created.
2011-01-20 07:45:27 -08:00
David 'Digit' Turner
cf9e1003ce libsysutils: Fix race condition in SocketListener thread.
+ Handle EINTR in accept(), write() and select()
+ Fix a memory leak when deleting the mClients list
+ Fix typo in SocketListener.h

Change-Id: Ie68bb3e2dbefe0dfdaa22a5cd06a42dbc4c0f8aa
2011-01-19 02:18:40 +01:00
Mike Lockwood
af7bdc6460 Add separate permission and group for access to MTP USB driver
Since the "usb" group and ACCESS_USB permission will be used by regular apps
to access USB devices in host mode, we need a separate permission for the
device side MTP driver.

Change-Id: Ibb546b8726d61e041fc7c273f71929624ad1575b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-10 08:22:30 -05:00
Mike Lockwood
be1def8d43 libusbhost: Tweak comments.
Change-Id: I45fdba7a94438f7c15fbca5dd65f07df9b522fb3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-07 11:31:58 -05:00
Brad Fitzpatrick
a2a1f3149f Let SocketClient users write binary data to clients.
This is a dependency for the DNS proxy CLs.

This CL also adds a new socket for the netd process to inherit which
is owned by the inet group.  (so only apps with the INTERNET
permission can use the DNS proxy...)

Change-Id: I8a51924e0ed56c6066f77e6f1b02d39bdadac51e
2011-01-06 11:09:55 -08:00
Mike Lockwood
e533c5f100 libusbhost: Support for multiple pending requests on a single endpoint
Add new usb_request struct to replace usb_endpoint, which is no longer needed.

Change-Id: Ia3637b3431a3597caced41bfec677ef0b044a453
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-06 09:21:13 -05:00
Mike Lockwood
7d700f8bdc libusbhost: Add usb_device_get_name_from_unique_id()
This allows converting from unique IDs to USB device names

Change-Id: I8e3b300790c01383aed8e3d4f547b54bcb7c2cd4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-29 09:27:16 -05:00
Mike Lockwood
50372073d2 libusbhost: Add accessor for the USB device descriptor
Change-Id: Ic3a54e2a06f3b4fa72f99b64025a911fbf525daf
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-13 19:08:27 -08:00
Mike Lockwood
cd185f23cc libusbhost: Add support for creating a usb_device struct from an existing fd
We will use this for sharing USB file descriptors across address spaces via Binder

Change-Id: Iadbd3e0a4178f79d1d778fdfd5175f6fe0e2aaf5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-13 19:08:14 -08:00
Erik Gilling
67ebdce982 Merge changes I4dcadf8e,I166d2859
* changes:
  libusbhost: add usb chapter 9 include to usbhost.h
  toolbox: add lsusb command
2010-12-09 15:53:03 -08:00
Erik Gilling
3af05b09eb libusbhost: add usb chapter 9 include to usbhost.h
Change-Id: I4dcadf8e8d9b25782351c9aeefb0d2cea81bbc9e
2010-12-09 15:28:06 -08:00
Kenny Root
cfb61c2720 Cygwin needs HAVE_OFF64_T and fix description
During testing of compilation, it was discovered that Cygwin actually
has off64_t.

Also the description was wrong for HAVE_OFF64_T

Change-Id: I6eb73d13da5a53fb03bf99ab7de82bfb6acab058
2010-12-08 11:19:11 -08:00
Kenny Root
07ad9961ae Add HAVE_OFF64_T to AndroidConfig.h
For platforms that have _FILE_OFFSET_BITS=32 and need to access large
files, we need some way to access 64-bit file APIs. This adds a hint to
allow programs to choose alternate APIs if possible.

Change-Id: Ifdc204df269350a22f52c0e4221e9d7d3b7a57fe
2010-12-06 15:20:54 -08:00
Mike Lockwood
2e0047bdc0 Add new AID_MEDIA_RW group to control write access to /data/media
BUG: 3113970

Change-Id: I233bd57e36d1e65847ead503e378304a958f492d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-10-29 10:55:54 -04:00
Brad Fitzpatrick
8c5669f9f9 Let SocketClient users write binary data to clients.
This is a dependency for the DNS proxy CLs.

This CL also adds a new socket for the netd process to inherit which
is owned by the inet group.  (so only apps with the INTERNET
permission can use the DNS proxy...)

Change-Id: Ic3475c697913ba85805b4e49801b65e7a1d59289
2010-10-27 10:27:34 -07:00
Jean-Baptiste Queru
43e21849da am ec70a9e1: am f2ff2112: Merge "Add config header file for Linux/PPC."
Merge commit 'ec70a9e1b5c12cde090749dc07e29b396b12f656'

* commit 'ec70a9e1b5c12cde090749dc07e29b396b12f656':
  Add config header file for Linux/PPC.
2010-10-21 13:45:44 -07:00
Jean-Baptiste Queru
ec70a9e1b5 am f2ff2112: Merge "Add config header file for Linux/PPC."
Merge commit 'f2ff2112309d03674b88433276a57500b723fa9e' into gingerbread-plus-aosp

* commit 'f2ff2112309d03674b88433276a57500b723fa9e':
  Add config header file for Linux/PPC.
2010-10-20 15:40:50 -07:00
Jean-Baptiste Queru
457ce8f672 am 67672e04: Merge a775965b from gingerbread
Merge commit '67672e04111a6cfdf572023a154675749c3fb550'

* commit '67672e04111a6cfdf572023a154675749c3fb550':
  Add AID_NFC for use by the NFC service.
2010-10-17 11:10:36 -07:00
Marcus Comstedt
b08f7d896a Add config header file for Linux/PPC.
Change-Id: I892e9d922ba4b4090bdb5de00d8cc7adf0123cfe
2010-10-16 14:35:48 +02:00
Jean-Baptiste Queru
67672e0411 Merge a775965b from gingerbread
Change-Id: I8c08cca033ef3efe6badd2a7ba4674dfb02d6b60
2010-10-15 17:46:44 -07:00
Raphael Moll
dc8827ee23 am 7e65ede6: am 9cd8057b: Merge "Define HAVE_STAT_ST_MTIM and disable it under MinGW/Cygwin." into gingerbread
Merge commit '7e65ede62065925e29b5b18f253758bb280f9383'

* commit '7e65ede62065925e29b5b18f253758bb280f9383':
  Define HAVE_STAT_ST_MTIM and disable it under MinGW/Cygwin.
2010-10-15 16:48:13 -07:00
Nick Pelly
85905a6ab4 Add AID_NFC for use by the NFC service.
Change-Id: I5b92f87dbacb9d855d99e10b3811f290fb64a144
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-15 02:16:05 -07:00
Raphael Moll
7e65ede620 am 9cd8057b: Merge "Define HAVE_STAT_ST_MTIM and disable it under MinGW/Cygwin." into gingerbread
Merge commit '9cd8057b6e8f5fc1254a4ed19e8127b5091b5dce' into gingerbread-plus-aosp

* commit '9cd8057b6e8f5fc1254a4ed19e8127b5091b5dce':
  Define HAVE_STAT_ST_MTIM and disable it under MinGW/Cygwin.
2010-10-14 13:41:46 -07:00
Raphael Moll
bb8ebabfd4 Define HAVE_STAT_ST_MTIM and disable it under MinGW/Cygwin.
This is used by build\libs\host\CopyFile.c

Also define HAVE_PRINTF_ZD since printf %zd is not
supported on MinGW/Cygwin.
This is used by frmk/base/libs/utils/ZipFileRO.cpp

Change-Id: I570ac5dd0a5b256ee67ad62433f1226597da3ea4
2010-10-13 21:54:56 -07:00