Merge commit '5f563d066dd173bd307f5a33581ee325dcd1e81f'
* commit '5f563d066dd173bd307f5a33581ee325dcd1e81f':
Change build path to "packages/app/Camera.apk". So that it will also
Merge commit 'ce803ae7b9162f92f43e64922b7d610e652ab468'
* commit 'ce803ae7b9162f92f43e64922b7d610e652ab468':
Update some class names in plugin.xml that were not updated by the refactoring.
Can't reproduce the NPE in ContentAssist listed in the
bug. However if things go really wrong there are a couple
objects that can be null so let's be defensive about them.
Merge commit '5ad70bbac751f41bbd27bc63968f47e8d4fd88b2'
* commit '5ad70bbac751f41bbd27bc63968f47e8d4fd88b2':
Fix the uninstall target in the Ant build script.
Merge commit 'af45b39d887ad4ec4a806d352009cdc28238f21f'
* commit 'af45b39d887ad4ec4a806d352009cdc28238f21f':
This adds a new helper program (qemu-props) to support the emulated system.
Its purpose is to contact the 'boot-properties' service during the
boot process and to set the list of system properties read from the
emulator program through it.
It must be launched from /system/etc/init.goldfish.rc as root.
It depends on the 'boot-properties' service being implemented by the
emulator (in a later patch). If not available, it will simply timeout.
This also fixes a potential crash in qemud which can happen in the following case:
- client sends a command to a service
- the service responds with one or more message
- the service immediately closes the connection before the client can read the data
what happened is that the FDHandler object was buffering out-going packets to the
client, but the Multiplexer acted on the disconnection immediately. This resulted
in:
- client_free() being called
- fdhandler_shutdown() being called
- the FDHandler being placed on the 'closing' list to be able to send
buffered packets later. And 'receiver_close' being called
- client_fd_close() being called, which would call client_free()
recursively
- the second client_free() call would free the object
- the first client_free() call would try to free the object again
- ==> dlmalloc() detects a double-free and immediately aborts.
the fixes simply avoids the calle to receiver_close() in fdhandler_shutdown()
since this function is called from an explicit shutdown request from the multiplexer,
it doesn't correspond to the case where the client has closed the connection itself.
Merge commit '8c093d5d2a6695cda888827a506633da922ad543'
* commit '8c093d5d2a6695cda888827a506633da922ad543':
This fixes the build to always define the ANDROID macro, and remove an empty -I from the compiler options.
Merge commit 'ceada119d3676a936988cb4b35f75ebf2c28b8ee'
* commit 'ceada119d3676a936988cb4b35f75ebf2c28b8ee':
Sensors: Use a native_handle for the data channel instead of a single file descriptor.
Merge commit 'dc10c2e5a388f22fd0e061521dac61b6751b23f4'
* commit 'dc10c2e5a388f22fd0e061521dac61b6751b23f4':
Update 'android update adb' to the new file format for 3rd USB Vendor IDs.
Merge commit '0db48f76fb99cdc9d0ac1fafd41f82e51996de06'
* commit '0db48f76fb99cdc9d0ac1fafd41f82e51996de06':
Make 'android update adb' write the USB vendor IDs in hexa.
Merge commit '906e6529fce5e5c4473d9bcdb05c03b13dac2b8f'
* commit '906e6529fce5e5c4473d9bcdb05c03b13dac2b8f':
SDK Updater: some refactoring and some new features.
Merge commit 'c35157377ba06eeef32bc6eaf582fd6e4c9805a8'
* commit 'c35157377ba06eeef32bc6eaf582fd6e4c9805a8':
Moved updateAdb into SdkManager and updated with new adb_usb.ini format.
The refactoring part involves moving as much as possible stuff
in SdkLib/internal/repository.
The UI has moved in SdkUiLib/internal/repository except a specific
public wrapper for calling the Sdk Updater window.
There are also a bunch of new classes to handle the internal
structures: Package is the base type and to match the XML element
names we have PlatformPackage, AddonPackage, DocPackage and
ToolPackage.
All headers have been fixed.
Merge commit '96882a3406371e79ca90640e5889c91af50ea4d2'
* commit '96882a3406371e79ca90640e5889c91af50ea4d2':
AI 149189: Adding dalvik porting guide based on content from the Android source tree under dalvik/docs/porting.html
Merge commit '97752d4f80740485ec7a248a0f80074fa6a784db'
* commit '97752d4f80740485ec7a248a0f80074fa6a784db':
Add a timeout flag to runtest for running native tests on devices.
This eliminates the requirement that all sensors share a single file descriptor.
This, along with concurrent changes in other projects, fixes bugs b/1614524 and b/1614481
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '838143199e2270e3f103050c76cf24539ad8dfe1' into donut
* commit '838143199e2270e3f103050c76cf24539ad8dfe1':
AI 149189: Adding dalvik porting guide based on content from the Android source tree under dalvik/docs/porting.html
