Merge commit 'd59f1dea1746b316e556df5b4d2080f110aabd1c' into gingerbread
* commit 'd59f1dea1746b316e556df5b4d2080f110aabd1c':
docs: update notepad tutorial to change EditNote activity title and update codelab zip
Downloading images over a slow connection could result in errors and
null images.
The JavaInputStreamAdaptor::do_skip method was correctly called in a
loop (to handle the EOF case using read()), but the amount that was
skipped at each time was not decreased by the amount already skipped.
Bug http://code.google.com/p/android/issues/detail?id=6066
Change-Id: Id897cdbe027e2d8c56df9fc399b3c92affb89c59
The cache key of a color drawable resource may be the same as another
drawable resource's value.
Change-Id: Ia971bb242ceac5e8f9346094009a10f356399ab9
(Reduced duplicated codes and replace TAB to white spaces)
And try to fix compile error.
Merge commit '703e5d3c7fbeb8ca0978045db01d40318f838612' into gingerbread-plus-aosp
* commit '703e5d3c7fbeb8ca0978045db01d40318f838612':
StrictMode: avoid an allocation in common case
Merge commit '0c36c96f2a5458ebd0a5a371c8d1515fcdccb002' into gingerbread-plus-aosp
* commit '0c36c96f2a5458ebd0a5a371c8d1515fcdccb002':
StrictMode: batch drop box writes for system apps
Make the initialValue() of the ThreadLocal be null, so checking it doesn't
cause one to be created in the case of an RPC call not using StrictMode.
Change-Id: I3ea19ce444a1b3c39a6e53c5cb5d4faf4b07a6c8
Merge commit '2c40582a6c3a5781b39d0504d5aa8934982989d2' into gingerbread-plus-aosp
* commit '2c40582a6c3a5781b39d0504d5aa8934982989d2':
Add native C APIs for working with the Asset Manager
This is for better correspondence with the Builder pattern.
See also: Effective Java, 2nd edition.
Change-Id: Iecccd42be49dea2ed8e4b8cc38ce96379cf3c11c
Now, when Thread A has a strict mode policy in effect and does a
Binder call to Thread B (most likely in another process), the strict
mode policy is passed along, but with the GATHER penalty bit set which
overrides other policies and instead gathers all offending stack
traces to a threadlocal which are then written back in the Parcel's
reply header.
Change-Id: I7d4497032a0609b37b1a2a15855f5c929ba0584d
- Fixed crash when deleting an effect chained before an effect having volume control
- Changed EFFECT_FLAG_VOLUME_CTRL to implicitely include EFFECT_FLAG_VOLUME_IND
(not need to set both in effect descriptor).
- Volume control changes from one effect to another if needed according to effect enable state
- EFFECT_CMD_SET_VOLUME is only sent when their is an actual change in volume
Change-Id: Ieebaf09157e2627366023569d95516646e03e26c
Merge commit '203ec9fa6eab21621969f36053d4cd59c23977a9'
* commit '203ec9fa6eab21621969f36053d4cd59c23977a9':
Interface support for custom HTTP headers in DL manager
Merge commit 'd6343c26b8580f61a257a3045bfa124049201116' into gingerbread-plus-aosp
* commit 'd6343c26b8580f61a257a3045bfa124049201116':
Interface support for custom HTTP headers in DL manager
