Merge commit '188f5a71061791906572de375c5efe26cadddbae'
* commit '188f5a71061791906572de375c5efe26cadddbae':
DO NOT MERGE: cherry-pick: libdrm1: Use libcrypto instead of libaes.
Merge commit 'b3fa1084ba31698fa5c58150a713d7abbadb1cd2'
* commit 'b3fa1084ba31698fa5c58150a713d7abbadb1cd2':
Docs only change: finish documentation of Android Quick Search Box related information in SearchManager.
* changes:
Fix the simulator build by removing librs_jni and libRS from it. Since libacc isn't 64-bit clean (it casts pointers to integers), and so can't be built for the gHardy simulator, everything that depends on it can't be built for the simulator either, which means removing libRS and librs_jni.
* changes:
Improve Browser performance by 1-2%. To address domain sanity bug, http://b/issue?id=1022797, we decoded/encoded the url for each request. As the url can be long, getBytes() and String.init are taking 1.5% in nytimes.com and 2.4% in cnn.com. By doing a simple URL encoding test, we can shave 1-2 secs thread time during loading.
Apparently the problem is caused by the fact that A2dpAudioStreamOut::standby() calls a2dp_stop() after the headset has been powered down.
The workaround consists in indicating to A2DP audio hardware that a close request is pending and that stanby() must be bypassed.
* changes:
Revert "SurfaceFlinger will now allocate buffers based on the usage specified by the clients. This allows to allocate the right kind of buffer automatically, without having the user to specify anything."
Merge commit '7b98b666ec465259c676c90cb12f3d1b4e1c7cf7'
* commit '7b98b666ec465259c676c90cb12f3d1b4e1c7cf7':
Fix a bug in getSocketError() in VpnService.
Merge commit 'c22e0c8012828474e8aa2e29b441ef02728b0842'
* commit 'c22e0c8012828474e8aa2e29b441ef02728b0842':
Fix order of setting/saving state in VpnService.
Merge commit 'cb2b2378c735e687c15e2af7f908c68ffae5fe90'
* commit 'cb2b2378c735e687c15e2af7f908c68ffae5fe90':
Fix the bug that EXIF attributes are always cached.
Merge commit '021fa3fa6fe88c33ad11a3139ebcd3a5be8eb953'
* commit '021fa3fa6fe88c33ad11a3139ebcd3a5be8eb953':
First update of SearchManager docs to reflect the new Donut Quick Search Box feature.
This change makes SurfaceHolder.setType(GPU) obsolete (it's now ignored).
Added an API to android_native_window_t to allow extending the functionality without ever breaking binary compatibility. This is used to implement the new set_usage() API. This API needs to be called by software renderers because the default is to use usage flags suitable for h/w.
* changes:
Fix bug 2043140. A race condition is encountered when an application invokes shutdown() on its TextToSpeech object while is has speak() requests still running. Since the TTS service destructor releases the synthesizer resources and sets the corresponding synth reference to null, an NPE was observed. The fix consists in catching NPEs whenever the sNativeSynth object is accessed, and return the matching error for the call. This change is a "low risk" version of the fix for bug 2025765i (same issue) which was reverted because it was higher risk than this CL: it affected the logic of each call to sNativeSynth. This CL only sets an error code when an NPE is fired because sNativeSynth is null.
