system-corennnn

Fork

Merge change 2897 into donut

* changes:
fix 1650170 pixelflinger depends on KeyedVector.h, etc

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.

fix 1650170 pixelflinger depends on KeyedVector.h, etc

Merge commit 'goog/master' into merge_master

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

am 192331d9: nexus: Add ListCmd to CommandListener

Merge commit '192331d9060763b92f7989124bedbd136689d735'

* commit '192331d9060763b92f7989124bedbd136689d735':
nexus: Add ListCmd to CommandListener

am 03f0d27f: libsysutils: Fix command argument passing bug + whitespace cleanup

Merge commit '03f0d27f6c49530a91402ed42f8ca4b2fda04b9f'

* commit '03f0d27f6c49530a91402ed42f8ca4b2fda04b9f':
libsysutils: Fix command argument passing bug + whitespace cleanup

get rid of utils/executablepath.h, which now lives in the simulator

Merge commit 'goog/master' into merge_master

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.

Fix bug where ECONNABORTED would have always occured on asocket_write.

Use POLLOUT for writes. Duh.

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.

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>

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>

libsysutils: Fix command argument passing bug + whitespace cleanup

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

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.

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;

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>

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.

Merge commit 'goog/master' into merge_master

Fix symbol lookup logic, squelch LOG output.

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/

add support and proper permissions for /dev/msm_camera/

Signed-off-by: Iliyan Malchev <malchev@google.com>

Don't compile abort_socket.c for host targets. It is only intended to run on Linux targets.

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.

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.

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.

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.

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>

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.