Merge commit '07fb33efe8b0cbedf518a8afa20d96d8d4bab69a'
* commit '07fb33efe8b0cbedf518a8afa20d96d8d4bab69a':
Refrain warning when not appropriate. Do not merge
Merge commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2' into gingerbread-plus-aosp
* commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2':
Refrain warning when not appropriate. Do not merge
Merge commit 'b58b27142a936aa76897a7040c08b8a0989a685b' into gingerbread-plus-aosp
* commit 'b58b27142a936aa76897a7040c08b8a0989a685b':
ZipFileRO: moar logging and wrap close
This is the first part of the camera hal change required for
0-memcpy of input video frames for video recording.
o removed check in setVideoSize()/getVideoSize() for impl consistency
Change-Id: I01274a62b9f9eaf32154d98f8d0bfedacf645698
+ Log error instead of crashing app process in SipManager's ListenerRelay.
+ Terminate dialog and transaction in SipSessionGroup.reset().
+ Remove redundant reset() in SipSessionGroup.
Change-Id: Ifbf29d2c9607ffe1a1a50b0c131ee3a4e81a0d0e
Now that text is renderer using bilinear filtering, each character is surrounded by
a 1 pixel border. This border needs to be initialized to a transparent value.
Change-Id: I26d3195db4bd576ac1f2da4c8f8e4dd18768bf12
Merge commit '7e53f3d70994cfef255953e1df1881d057477d06'
* commit '7e53f3d70994cfef255953e1df1881d057477d06':
Fix bug 3047653 - Text select handles stick around when they shouldn't
Merge commit '624380a14def6c2acdb473e09c36139acbcefbf9' into gingerbread-plus-aosp
* commit '624380a14def6c2acdb473e09c36139acbcefbf9':
Fix bug 3047653 - Text select handles stick around when they shouldn't
Text select handles will now fade out on their own after a few seconds
since many apps expect a selection to be persistent while a text field
stays focused in touch mode. The user may tap within the selection to
bring the anchors back.
Text select handles will also disappear upon leaving touch mode.
Fix a bug that impaired cut/paste from the context menu.
Change-Id: I8f431e2d261aec02581150125d11324a3ee11656
Merge commit '53303da0a78da2042ec60226ee290d2c903e6023'
* commit '53303da0a78da2042ec60226ee290d2c903e6023':
Fix bug 3024080 - Date picker month field uses numeric text field
Merge commit '8bcbebd4178b2e9aca9ee3bd9e1e12c42e74c8db' into gingerbread-plus-aosp
* commit '8bcbebd4178b2e9aca9ee3bd9e1e12c42e74c8db':
Fix bug 3024080 - Date picker month field uses numeric text field
This reverts commit bdf11be97bd732e8891ae19342c937da6e659afa.
Fix a missing import from manual merge.
Change-Id: If373626f07250cbfe07e5c04cf02ad9ee5a0ab2a
Merge commit 'e11b76d3efb056edea301d53a354d0730adf3520'
* commit 'e11b76d3efb056edea301d53a354d0730adf3520':
Minor logging changes to input dispatcher to help with debugging.
Merge commit 'e951ef07dd8cb36ec0e127e80f5d558b8a2d6125' into gingerbread-plus-aosp
* commit 'e951ef07dd8cb36ec0e127e80f5d558b8a2d6125':
Wait for initial device scan to finish before updating config.
Merge commit 'f6295b35db7a7c40d4fb1c981e231bebcf13e2ba' into gingerbread-plus-aosp
* commit 'f6295b35db7a7c40d4fb1c981e231bebcf13e2ba':
Minor logging changes to input dispatcher to help with debugging.
This change narrows the opportunity for a race condition setting the
resource Configuration while devices are being updated.
Change-Id: I58efa563f4129ab0fce7108511d16a99dff7e451
There is apparently still a race upon reading the entry Local File
Header that can't be tracked down, so move the LFH check inside the
mutex-protected block so we can call lseek again to see where we are
when we log an error.
Also, close() can fail so use TEMP_FAILURE_RETRY on it so we don't
unwittingly leak file descriptors when Mean Mr. EINTR comes a-knocking.
Change-Id: I753abad0bd882fe28f7281c406fa76f64393ef4c
Added dumpsys reporting to EventHub.
Made the formatting a bit clearer.
Added 'Locked' suffix to some internal methods of EventHub.
Change-Id: Ic449560bcce378f6361895d27c66854e9724abb0