GetObjectPropValue and SetObjectPropValue are disabled until I figure out
why Windows doesn't like what I have done.
Change-Id: I74e945ef3ea031f6d46f4ebaa8df815da0a5c3ed
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'cec075cc420e601602d6bfe16272c30006d262a6'
* commit 'cec075cc420e601602d6bfe16272c30006d262a6':
Ensure that buffering updates eventually hit 100% after we download everything.
Merge commit '235840228b0692b66d854ff499b5c4060f883e03' into gingerbread-plus-aosp
* commit '235840228b0692b66d854ff499b5c4060f883e03':
Ensure that buffering updates eventually hit 100% after we download everything.
Merge commit 'd64f4a983df4fd11795e04896d8c48852f6b1777' into gingerbread-plus-aosp
* commit 'd64f4a983df4fd11795e04896d8c48852f6b1777':
DO NOT MERGE fix null check
Merge commit '96dc45597e53742a2c8453f9ce03f7d501a75668'
* commit '96dc45597e53742a2c8453f9ce03f7d501a75668':
Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now.
-> pushed functionality from AdapterViewAnimator to StackView
-> only modifying clipping flags as far up the view
hierarchy as needed
-> still need framework level solution for drawing outside bounds
ViewGroup touch dispatch temp fix
-> Touch event was being modified and not reset in some
code paths.
Change-Id: I8135b62e2d73f239b9df407b0fa93bc434796989
Merge commit 'b8814dce287552c1bdf13fa999296ebc7387776d' into gingerbread-plus-aosp
* commit 'b8814dce287552c1bdf13fa999296ebc7387776d':
Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now.
Rename jni call to note that, when pressing the dpad, the
cursor ring is to shown for a short time. The old name suggested
that this was tracking whether the link was followed.
Fix an unrelated change (from gingerbread, automated
merge unlikely to succeed) to check for a null
WebChromeClient.
Requires a companion change in external/webkit
http://b/2135321 (rename jni call)
http://b/2945171 (null check)
Change-Id: I9d4a92dbba1f92da8dc8cde755a2066de59514f9
Merge commit '468204124e95bbf74ae8cc000318ade29e311be6'
* commit '468204124e95bbf74ae8cc000318ade29e311be6':
don't try to lock a buffer that wasn't allocated with SW usage bits
Merge commit '8eb16af29303cda190133a1d220b9ecd9341e261' into gingerbread-plus-aosp
* commit '8eb16af29303cda190133a1d220b9ecd9341e261':
don't try to lock a buffer that wasn't allocated with SW usage bits
Merge commit '44b31fdd86053945e1eeb3b91783577aebd95b55'
* commit '44b31fdd86053945e1eeb3b91783577aebd95b55':
Make the default backup configuration "disabled; local transport selected"
Merge commit '7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758' into gingerbread-plus-aosp
* commit '7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758':
Make the default backup configuration "disabled; local transport selected"
Merge commit 'd5e601c2304610085e3d7a276c4bbcd984ac89f9' into gingerbread
* commit 'd5e601c2304610085e3d7a276c4bbcd984ac89f9':
Make the default backup configuration "disabled; local transport selected"
