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
strchr and strrchr now return const char* instead of char*
Change-Id: I5ca831b8951af7e6306eb9d9d6f78ed2ec13d649
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '4fd416880e53c172bac4a51b2eafea699b58badf'
* commit '4fd416880e53c172bac4a51b2eafea699b58badf':
docs: lots of additions to the resources docs
Merge commit 'a6be4e01b23610cbcc27c6f26cfa390beabfa1fe'
* commit 'a6be4e01b23610cbcc27c6f26cfa390beabfa1fe':
The ICU data is no longer compiled directly into the shared library.
Fixed some logic in TelephonyRegistry so its notion of the state of our connection is
preserved, but it still sends out proper CONNECTING msg on secondary APNS (ie, bringing
up mms while the default connection was already up - it used to send out two CONNECTING
msgs instead of one CONNECTING and one CONNECTED).
Fixes mms while on mobile data.
bug:2840564
Change-Id: I69159aa0f471396680615ce6b9785620d844968f
version of the accounts because the accounts changed broadcast is
sent from within the transaction try block, thus before db.endTransaction()
is called.
bug: 2839034
Change-Id: I814c7de9998ba52b85256dd2f3f19104fba3049c
Merge commit '5352d2378d2f92ebe0657e4caedb4498492fc404' into gingerbread-plus-aosp
* commit '5352d2378d2f92ebe0657e4caedb4498492fc404':
docs: lots of additions to the resources docs
Merge commit '38137d7a27b037611c70a9d900aa53b4c15563bf' into gingerbread
* commit '38137d7a27b037611c70a9d900aa53b4c15563bf':
docs: lots of additions to the resources docs
Merge commit 'd6a85a21418338a7797bff731fa7a551f62a9e86' into gingerbread-plus-aosp
* commit 'd6a85a21418338a7797bff731fa7a551f62a9e86':
Support user-supplied timescales for authoring
Merge commit '562124e84d8ae63b614b14ba257680571091ef1f' into gingerbread-plus-aosp
* commit '562124e84d8ae63b614b14ba257680571091ef1f':
Clean up some style in the makefiles.
Merge commit '3a053db28451858162f3dd84f18fae2f245b07f1' into gingerbread-plus-aosp
* commit '3a053db28451858162f3dd84f18fae2f245b07f1':
The ICU data is no longer compiled directly into the shared library.
