Merge commit '73139aead7203c22f3a4abb5e9fd8abd5ef249b1'
* commit '73139aead7203c22f3a4abb5e9fd8abd5ef249b1':
Change the resource path for fwd locked apps when scanning the fwd locked install
The current gralloc allocates buffer memory for render targets that will typically have NPOT dimensions. Assuming that the vendor driver supports converting the resulting NPOT android_native_buffer_t to a NPOT EGLImage, SurfaceFlinger calls glEGLImageTargetTexture2DOES(), and uses glGetError() to test whether the GL can support creating an EGL target texture with the specified NPOT EGLImage. If it is supported, the DIRECT_TEXTURE flag remains set, otherwise it is cleared.
Tangentially, if the driver advertises the GL_ARB_texture_non_power_of_two extension, the NPOT_EXTENSION flag is set, otherwise it is cleared.
If the driver supported creating an EGL target texture from a NPOT source EGLImage, it implicitly creates a NPOT texture. This does not need any glScalef() texture coordinate correction in LayerBase::drawWithOpenGL(). However, the same driver may not advertise the GL_ARB_texture_non_power_of_two extension nor generally support NPOT textures that were not derived from EGLImages. So SurfaceFlinger may flag only DIRECT_TEXTURE, not NPOT_EXTENSION.
Therefore, the test in LayerBase::drawWithOpenGL() should only perform the glScalef() if neither NPOT_EXTENSION or DIRECT_TEXTURE are flagged. Otherwise scaling is applied to NPOT EGL target textures when none is required.
* changes:
Fix 2016808. We used to send the new scale/scroll info to the UI thread after WebCore finish the first layout. As the picture in the UI thread is still the previous one, if there is a UI update happened before we generate the new picture, the new scale/scroll will be applied to the old picture.
Merge commit 'b91e2b0292f9f4f76175a18e6e3cf392f3967ae8'
* commit 'b91e2b0292f9f4f76175a18e6e3cf392f3967ae8':
Special-case search within the browser to not show the app icon
Merge commit '9c71716e3de9b6a7e1830cae13da35ebdeeaaa80'
* commit '9c71716e3de9b6a7e1830cae13da35ebdeeaaa80':
Fixing bug #2023024 - there is an out of bounds exception that
Merge commit '41c104339951e0e5e78240e1f48455c21b3ba5fd'
* commit '41c104339951e0e5e78240e1f48455c21b3ba5fd':
Fix MulticastLock API to match WifiLock API.
Merge commit '0067057c31720f64926d6ee3d841b15dc197d2df'
* commit '0067057c31720f64926d6ee3d841b15dc197d2df':
Fix the TabWidget to display custom views for the tabs better when the tabs have different sizes.
Merge commit 'b307c8945d4bf8d843445f3cc6d727f4e43d90f0'
* commit 'b307c8945d4bf8d843445f3cc6d727f4e43d90f0':
Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.
It turns out we were not returning the density for anything retrieved from a
TypedArray... which basically means any bitmap references from a layout or style...!!!
This is now fixed.
Also fiddle with the density compatibility mode to turn on smoothing in certain situations,
helping the look of things when they need to scale and we couldn't do the scaling at
load time.
* changes:
Special-case search within the browser to not show the app icon to the left of the search field. Also, because this removes context about whether you're in browser search or global search, we make sure to clear any entered text if you jump out to global search from within browser search.
* changes:
Fixing bug #2023024 - there is an out of bounds exception that can happen if services are going away as the AccessibilityManagerService is trying to dispatch notifications to these services. Catching this exception and bailing because having this exception means that there are no more services around that need to get this notification.
Merge commit '0869f7ef1efa9fe2e26b20e525952ad611d379aa'
* commit '0869f7ef1efa9fe2e26b20e525952ad611d379aa':
Log uid and package name when launching intents from search
Merge commit '67897b1af7ab7bea1dc3f9caf5f3ee5c026a179d'
* commit '67897b1af7ab7bea1dc3f9caf5f3ee5c026a179d':
DO NOT MERGE. Already in master. Fix calendar test.
Merge commit '1521cd6e657ba4efa9382ab73d3cbba3bdf50ead'
* commit '1521cd6e657ba4efa9382ab73d3cbba3bdf50ead':
Reset the mDpiX and mDpiY values when qemu.sf.lcd_density is defined.