Commit graph

6230 commits

Author SHA1 Message Date
Android (Google) Code Review
3f62720562 Merge change 2875 into donut
* changes:
  Added ashmem_get_size_region() function.
2009-06-02 05:28:47 -07:00
Android (Google) Code Review
f6243df747 am 8b48cf61: Merge change 2897 into donut
Merge commit '8b48cf61704bbd1cd6e672fe73d8491f8984b484'

* commit '8b48cf61704bbd1cd6e672fe73d8491f8984b484':
  fix 1650170 pixelflinger depends on KeyedVector.h, etc
2009-06-02 00:36:23 -07:00
Android (Google) Code Review
8b48cf6170 Merge change 2897 into donut
* changes:
  fix 1650170 pixelflinger depends on KeyedVector.h, etc
2009-06-01 19:00:49 -07:00
Bjorn Bringert
7be52b1a0e Added ashmem_get_size_region() function.
This is needed by the MemoryFile changes in
https://android-git.corp.google.com/g/2714
where it is used to find out whether a file descriptor
refers to an ashmem region.
2009-06-02 00:55:30 +01:00
Mathias Agopian
006ba85e98 fix 1650170 pixelflinger depends on KeyedVector.h, etc 2009-06-01 15:27:46 -07:00
Mathias Agopian
7c5e613940 Merge commit 'goog/master' into merge_master 2009-06-01 14:30:09 -07:00
San Mehat
cbc92d014b am 3c5a6f0b: nexus: Refactor some of the create/remove network path and add code for retrieving network lists from supplicant nexus: Rework properties nexus: Implement wifi network enable/disable and add some error checking nexus: Add some TODOs nexus: Whitespace cleanup nexus: Add bindings between controllers and network interfaces nexus: Add properties for InterfaceConfig nexus: Fix a few conversion bugs in InterfaceConfig
Merge commit '3c5a6f0bc8aefc4dacab8e95ba9017a7ac7d91f5'

* commit '3c5a6f0bc8aefc4dacab8e95ba9017a7ac7d91f5':
  nexus: Refactor some of the create/remove network path and add code for
2009-06-01 10:09:06 -07:00
San Mehat
9b8c28ab44 am 192331d9: nexus: Add ListCmd to CommandListener
Merge commit '192331d9060763b92f7989124bedbd136689d735'

* commit '192331d9060763b92f7989124bedbd136689d735':
  nexus: Add ListCmd to CommandListener
2009-06-01 10:09:05 -07:00
San Mehat
ae41f613b8 am 03f0d27f: libsysutils: Fix command argument passing bug + whitespace cleanup
Merge commit '03f0d27f6c49530a91402ed42f8ca4b2fda04b9f'

* commit '03f0d27f6c49530a91402ed42f8ca4b2fda04b9f':
  libsysutils: Fix command argument passing bug + whitespace cleanup
2009-06-01 09:35:15 -07:00
Mathias Agopian
89ac364c54 get rid of utils/executablepath.h, which now lives in the simulator 2009-05-31 18:50:09 -07:00
Mathias Agopian
e26cbeacaf Merge commit 'goog/master' into merge_master 2009-05-31 01:14:49 -07:00
Jack Palevich
f1f39cca30 Make sure we don't overflow various internal compiler buffers.
We may replace some of these tables with dynamically growing data
structures, but in the meantime we will not trash memory.
2009-05-29 18:03:15 -07:00
Nick Pelly
fa5bf90831 Fix bug where ECONNABORTED would have always occured on asocket_write.
Use POLLOUT for writes. Duh.
2009-05-29 16:10:22 -07:00
Nick Pelly
260f48a917 Helper to perform abortable blocking operations on a socket:
asocket_connect()
   asocket_accept()
   asocket_read()
   asocket_write()
 These calls are similar to the regular syscalls, but can be aborted with:
   asocket_abort()

Calling close() on a regular POSIX socket does not abort blocked syscalls on
that socket in other threads.

After calling asocket_abort() the socket cannot be reused.

Call asocket_destory() *after* all threads have finished with the socket to
finish closing the socket and free the asocket structure.

The helper is implemented by setting the socket non-blocking to initiate
syscalls connect(), accept(), read(), write(), then using a blocking poll()
on both the primary socket and a local pipe. This makes the poll() abortable
by writing a byte to the local pipe in asocket_abort().

asocket_create() sets the fd to non-blocking mode. It must not be changed to
blocking mode.

Using asocket will triple the number of file descriptors required per
socket, due to the local pipe. It may be possible to use a global pipe per
process rather than per socket, but we have not been able to come up with a
race-free implementation yet.

All functions except asocket_init() and asocket_destroy() are thread safe.
2009-05-29 16:10:16 -07:00
San Mehat
3c5a6f0bc8 nexus: Refactor some of the create/remove network path and add code for
retrieving network lists from supplicant
nexus: Rework properties
nexus: Implement wifi network enable/disable and add some error checking
nexus: Add some TODOs
nexus: Whitespace cleanup
nexus: Add bindings between controllers and network interfaces
nexus: Add properties for InterfaceConfig
nexus: Fix a few conversion bugs in InterfaceConfig

Signed-off-by: San Mehat <san@google.com>
2009-05-29 15:26:21 -07:00
San Mehat
192331d906 nexus: Add ListCmd to CommandListener
Signed-off-by: San Mehat <san@google.com>

nexus: Add InterfaceConfig and flesh out some more flow

Signed-off-by: San Mehat <san@google.com>
2009-05-29 15:26:00 -07:00
San Mehat
03f0d27f6c libsysutils: Fix command argument passing bug + whitespace cleanup
Signed-off-by: San Mehat <san@google.com>
2009-05-29 15:25:45 -07:00
Jack Palevich
ac0e95eb60 Improve ACC error reporting.
Now return an error code and an error message, rather than just
printing to stderr or calling exit().

Check to see we don't exceed our code size.
2009-05-29 13:53:44 -07:00
Jack Palevich
653f42da92 Pointer-ize the acc front end.
The ACC compiler used to be able to compile itself. This was a neat
feature, but because ACC only supports ints, pointers are stored as
ints, and cast to pointers when used.

This checkin turns many ints that are really pointers back into
pointers, so that the code is clearer.

 int ch;
 char* glo;
 char* sym_stack;
 char* dstk;
 char* dptr;
 int dch;
 char* last_id;
2009-05-29 09:32:14 -07:00
David 'Digit' Turner
730c8d7c03 am ebefc48e: Expose the stable/frozen log-related definitions of <cutils/logd.h> into a new header: <android/log.h>
Merge commit 'ebefc48e61a7d5cf2a3228e6c8729feeeb42d1b4'

* commit 'ebefc48e61a7d5cf2a3228e6c8729feeeb42d1b4':
  Expose the stable/frozen log-related definitions of <cutils/logd.h> into a new header: <android/log.h>
2009-05-29 06:03:27 -07:00
David 'Digit' Turner
ebefc48e61 Expose the stable/frozen log-related definitions of <cutils/logd.h> into a new header: <android/log.h>
This is in order to expose the correponding functions in the 1.5 Native Development Kit, to allow
applicative native code to send messages to the log.
2009-05-29 14:45:04 +02:00
Mathias Agopian
1edfd382ba Merge commit 'goog/master' into merge_master 2009-05-27 14:25:54 -07:00
Jack Palevich
09555c7a18 Fix symbol lookup logic, squelch LOG output. 2009-05-27 12:25:55 -07:00
Iliyan Malchev
0675ba5bd4 am fc0182eb: add support and proper permissions for /dev/msm_camera/
Merge commit 'fc0182eb1db0620eb71fb6ca219b15a17dcd912f'

* commit 'fc0182eb1db0620eb71fb6ca219b15a17dcd912f':
  add support and proper permissions for /dev/msm_camera/
2009-05-26 17:53:37 -07:00
Iliyan Malchev
fc0182eb1d add support and proper permissions for /dev/msm_camera/
Signed-off-by: Iliyan Malchev <malchev@google.com>
2009-05-26 16:45:51 -07:00
Raphael
f3cdf37276 Don't compile abort_socket.c for host targets. It is only intended to run on Linux targets. 2009-05-26 13:23:23 -07:00
Android (Google) Code Review
cd95bf3ea3 am a4aace71: Merge change 2437 into donut
Merge commit 'a4aace716e76e8e2c2e6e1a807b402256d9924dc'

* commit 'a4aace716e76e8e2c2e6e1a807b402256d9924dc':
  Modify init.goldfish.sh to launch the 'qemu-props' program when the emulator boots up.
2009-05-26 10:11:22 -07:00
Android (Google) Code Review
a4aace716e Merge change 2437 into donut
* changes:
  Modify init.goldfish.sh to launch the 'qemu-props' program when the emulator boots up. Its purpose is to receive a list of system property (name,value) pairs and set them on launch.
2009-05-26 08:29:35 -07:00
David 'Digit' Turner
653164b6a0 Modify init.goldfish.sh to launch the 'qemu-props' program when the emulator boots up.
Its purpose is to receive a list of system property (name,value) pairs and set them on launch.
2009-05-26 13:16:59 +02:00
Mike Lockwood
5b043d6182 am 1f546e6d: adb: Allow enabling of device side adbd logging with a persistent system property.
Merge commit '1f546e6d1f6ccd1964336ddf0d8e8b3b11b1e945'

* commit '1f546e6d1f6ccd1964336ddf0d8e8b3b11b1e945':
  adb: Allow enabling of device side adbd logging with a persistent system property.
2009-05-25 15:32:19 -07:00
Mike Lockwood
1f546e6d1f adb: Allow enabling of device side adbd logging with a persistent system property.
To enable logging, set the property persist.adb.trace_mask to a hex value
containing the bitmask for adb_trace_mask (see the TRACE_* enum values in adb.h).
This will result in adb writing log output to a file in /data/adb/
No logging will occur if persist.adb.trace_mask is not set or has a value
that cannot be parsed as a hex integer.
The property is read once only at startup, so you must reboot or restart adbd
for changes in the property to take effect.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-25 18:17:55 -04:00
Mike Lockwood
64c6397b56 am 6a3075c7: adb: Add adbd to the AID_SDCARD_RW group to allow writing to the SD card.
Merge commit '6a3075c78287ea5a7ee7a3c85cde58e894350822'

* commit '6a3075c78287ea5a7ee7a3c85cde58e894350822':
  adb: Add adbd to the AID_SDCARD_RW group to allow writing to the SD card.
2009-05-25 11:32:08 -07:00
Mike Lockwood
6a3075c782 adb: Add adbd to the AID_SDCARD_RW group to allow writing to the SD card.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-25 14:22:58 -04:00
Android (Google) Code Review
fc8e241871 am 0469d2c3: Merge change 2282 into donut
Merge commit '0469d2c37adddcb30cb0d88772bef33ac26c6500'

* commit '0469d2c37adddcb30cb0d88772bef33ac26c6500':
  Support for 3rd party USB Vendor IDs in adb.
2009-05-22 15:30:14 -07:00
Android (Google) Code Review
0469d2c37a Merge change 2282 into donut
* changes:
  Support for 3rd party USB Vendor IDs in adb.
2009-05-22 15:28:51 -07:00
Xavier Ducrohet
a481d096fe Support for 3rd party USB Vendor IDs in adb.
Vendor IDs are read from ~/.android/adb_usb.ini. The format is very simple:
1 number per line. First number is ID count, followed by the ID themselves.
Lines starting with # are considered comments.

Other misc changes: moved VENDOR_ID_* to usb_vendors.c to prevent direct
access. Made transport_usb.c reuse the USB constant introduced in usb_osx
(moved them to adb.h)
2009-05-22 15:25:25 -07:00
Android (Google) Code Review
121f3b48d6 Merge change 2341
* changes:
  Convert libacc into a shared library.
2009-05-22 12:41:06 -07:00
Jack Palevich
1cdef20774 Convert libacc into a shared library.
Document internal CodeGenerator interface

Move license to a separate license file.

Define a public API for calling libacc.

Update the "acc" test program to use the public API.
Move "main.cpp" and test scripts into the tests subdirectory.
Move test data from tests to tests/data
Remove stale test data.
2009-05-22 12:09:55 -07:00
Android (Google) Code Review
940f7cc5be am 4919d556: Merge change 2135 into donut
Merge commit '4919d556f5473e9b2b6db2b057f0a88d627fb77f'

* commit '4919d556f5473e9b2b6db2b057f0a88d627fb77f':
  nexus: Switch controllers to use abstracted properties and refactor command protocol
2009-05-22 11:25:59 -07:00
Android (Google) Code Review
4cd6e915e5 Merge change 2329
* changes:
  Fix bug where ECONNABORTED would have always occured on asocket_write.
2009-05-22 09:30:24 -07:00
Nick Pelly
111bfcefc3 Fix bug where ECONNABORTED would have always occured on asocket_write.
Use POLLOUT for writes. Duh.
2009-05-22 09:09:34 -07:00
Android (Google) Code Review
4919d556f5 Merge change 2135 into donut
* changes:
  nexus: Switch controllers to use abstracted properties and refactor command protocol
2009-05-22 08:43:08 -07:00
San Mehat
4876567cb9 nexus: Switch controllers to use abstracted properties and refactor command protocol
Also fixes a select() bug and removes debugging

Signed-off-by: San Mehat <san@google.com>

nexus: fix whitespace
2009-05-22 08:40:13 -07:00
Mathias Agopian
67667115c5 merge master to master_gl 2009-05-22 01:08:01 -07:00
Android (Google) Code Review
ad3f0d74b4 am 47c73898: Merge change 2166 into donut
Merge commit '47c73898b871143708c6d952481ee3063a59246a'

* commit '47c73898b871143708c6d952481ee3063a59246a':
  add bootanimation service to init.rc
2009-05-21 19:35:03 -07:00
Android (Google) Code Review
47c73898b8 Merge change 2166 into donut
* changes:
  add bootanimation service to init.rc
2009-05-21 19:33:40 -07:00
Mathias Agopian
8b2cf9f04b add bootanimation service to init.rc 2009-05-21 18:45:53 -07:00
Mathias Agopian
d2362c2b20 am fee77ec0: don\'t use cdefs.h as it breaks the windows build.
Merge commit 'fee77ec093f78c1bb0ce85aa16d7ee8e8fa06f8a'

* commit 'fee77ec093f78c1bb0ce85aa16d7ee8e8fa06f8a':
  don't use cdefs.h as it breaks the windows build.
2009-05-21 13:11:11 -07:00
Mathias Agopian
fee77ec093 don't use cdefs.h as it breaks the windows build. 2009-05-21 13:08:39 -07:00
Xavier Ducrohet
8a88939d64 am a09fbd16: Preparation work for adb to support USB vendor Ids provided by SDK add-ons.
Merge commit 'a09fbd164d2e088bc5433d310e25640ae048d47d'

* commit 'a09fbd164d2e088bc5433d310e25640ae048d47d':
  Preparation work for adb to support USB vendor Ids provided by SDK add-ons.
2009-05-21 11:55:52 -07:00