Merge commit 'a3d15d3b01146df40e72d67b79dd1f9368398f23'
* commit 'a3d15d3b01146df40e72d67b79dd1f9368398f23':
1) Capture the start memory before the test started
Merge commit 'f553a58425c66a990dbc5f4579c976a0636fc573'
* commit 'f553a58425c66a990dbc5f4579c976a0636fc573':
Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.
Merge commit '44e537a859966378f1599db5e5d41045e78efd94'
* commit '44e537a859966378f1599db5e5d41045e78efd94':
Improves the touch-based text selection UI in text boxes.
Merge commit '0c15b889317e9569282e4513db598369a0506b40'
* commit '0c15b889317e9569282e4513db598369a0506b40':
Revert "When using MDP, we needed to use a texture for diming."
Merge commit '16c82c34edfef70bc74e6d6fdf3f08506bf8f27f'
* commit '16c82c34edfef70bc74e6d6fdf3f08506bf8f27f':
Fire OnGroupClick events when collapsing a group in ExpandableListView.
Merge commit '0f91f87002a9cdf0216aa9ae60001b1d4ff6ea61'
* commit '0f91f87002a9cdf0216aa9ae60001b1d4ff6ea61':
move event log tags used by ActivityManager into this package
Merge commit 'e300deaf2fd2842240ea90fd00296a6e2ceba9d8'
* commit 'e300deaf2fd2842240ea90fd00296a6e2ceba9d8':
Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
Merge commit '32c66ee4976857c0db80ebfcfe42d7627dc9d2a2'
* commit '32c66ee4976857c0db80ebfcfe42d7627dc9d2a2':
If the usage stats file doesn't exist in the first place there is no need to
Merge commit 'b8341cf7c8b0b4af14ea87a4c2335e28865adff1' into eclair-mr2-plus-aosp
* commit 'b8341cf7c8b0b4af14ea87a4c2335e28865adff1':
Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
Merge commit '8e6d79e2b570d73b620a4f5a98d461329e5f2477' into eclair-mr2-plus-aosp
* commit '8e6d79e2b570d73b620a4f5a98d461329e5f2477':
1) Capture the start memory before the test started
Merge commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7' into eclair-mr2
* commit '6d42d80653f2c41f3e72a878a1d9a6f9693b89f7':
Fix issue 2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
Merge commit '8445f367070514dce3154be73827107b8a93f234' into eclair-mr2
* commit '8445f367070514dce3154be73827107b8a93f234':
1) Capture the start memory before the test started
Merge commit '5921fb51e0219ddd7cad439a73495f320c57d50e' into eclair-mr2-plus-aosp
* commit '5921fb51e0219ddd7cad439a73495f320c57d50e':
Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.
* changes:
Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.
Merge commit '9e3e2d3a6967301730fd383e8b04d53fdfd008e5' into eclair-mr2-plus-aosp
* commit '9e3e2d3a6967301730fd383e8b04d53fdfd008e5':
Show search icon for <input type="search"> fields.
Merge commit '7c42703082574638ecaa88ea18b0cc94bfabea2d' into eclair-mr2-plus-aosp
* commit '7c42703082574638ecaa88ea18b0cc94bfabea2d':
Improves the touch-based text selection UI in text boxes.
Fixed AudioFlinger::openInput() broken in change ddb78e7753be03937ad57ce7c3c842c52bdad65e
so that an invalid IO handle (0) is returned in case of failure.
Applied the same correction to openOutput().
Modified RecordThread start procedure so that a failure occuring during the first read from audio input stream is detected and causes
the record start to fail.
Modified RecordThread stop procedure to make sure that audio input stream fd is closed before we exit the stop function.
Fixed AudioRecord JAVA and JNI implementation to take status of native AudioRecord::start() into account
and not change mRecordingState to RECORDSTATE_RECORDING if start fails.
Merge commit '401f422078581ae741b68d879609e57a4b227455' into eclair-mr2-plus-aosp
* commit '401f422078581ae741b68d879609e57a4b227455':
Revert "When using MDP, we needed to use a texture for diming."
Merge commit '0019215fc395ef12c191049b1903eeabf70859cf' into eclair-mr2
* commit '0019215fc395ef12c191049b1903eeabf70859cf':
Revert "When using MDP, we needed to use a texture for diming."
Without this, boot fails with:
12-05 21:06:56.984: ERROR/Zygote(435):
java.lang.IllegalStateException: Missing class(es) for preloading,
update preloaded-classes [android.server.search.SearchableInfo]
This was caused by https://android-git.corp.google.com/g/34797
Change-Id: I195b7e72a411401e2de8c1d6c2e7db0fe1badec6
Merge commit 'd1b3988adfe0b55291d0ebc8479e62ab1d2b9d21' into eclair-mr2-plus-aosp
* commit 'd1b3988adfe0b55291d0ebc8479e62ab1d2b9d21':
Fire OnGroupClick events when collapsing a group in ExpandableListView.
Merge commit 'f6683bb5592825a62e30760abb0734deaaf7bd93' into eclair-mr2-plus-aosp
* commit 'f6683bb5592825a62e30760abb0734deaaf7bd93':
move event log tags used by ActivityManager into this package
We can now locate event log tag definitions in individual packages
(and java constants for the tag numbers get auto-generated), so move
all the tags used by the system server into the package.
Merge commit 'fc32a062f833df35ea153bbd857046052e2ce238' into eclair-mr2-plus-aosp
* commit 'fc32a062f833df35ea153bbd857046052e2ce238':
Fix bitmask in aapt's StringPool length construction
Merge commit '30d905235074f343ebac6002408ab5c2b360ea14' into eclair-mr2-plus-aosp
* commit '30d905235074f343ebac6002408ab5c2b360ea14':
Improve error message thrown when eglCreateContext fails.
Improve error reporting by always returning the public
* changes:
Improve error message thrown when eglCreateContext fails.
Improve error reporting by always returning the public EGL10.EGL_NO_XXX objects for displays, surfaces, and contexts.
Merge commit 'b6936607b61e3115b5924e41be29c0430dd05613' into eclair-mr2-plus-aosp
* commit 'b6936607b61e3115b5924e41be29c0430dd05613':
Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
