OSDN Git Service
Andreas Huber [Tue, 8 Dec 2009 00:37:37 +0000 (16:37 -0800)]
Note to self: Don't reverse the arguments to fseek(o)...
Android (Google) Code Review [Mon, 7 Dec 2009 22:31:46 +0000 (14:31 -0800)]
Merge change I250f2433 into eclair-mr2
* changes:
Initial checkin of stagefright MP3 audio decoder based on PV source code.
Andreas Huber [Mon, 7 Dec 2009 22:22:35 +0000 (14:22 -0800)]
Initial checkin of stagefright MP3 audio decoder based on PV source code.
Android (Google) Code Review [Mon, 7 Dec 2009 21:39:22 +0000 (13:39 -0800)]
Merge change Idff5eb2a into eclair-mr2
* changes:
Set InputType of WebTextView according to <input> field's type.
Leon Scroggins [Mon, 7 Dec 2009 18:38:07 +0000 (13:38 -0500)]
Set InputType of WebTextView according to <input> field's type.
Help fix http://b/issue?id=
2150538 and http://b/issue?id=
1890360
Use the <input type> information to set the InputType, so that
the IME can show the correct options. Also consolidate setup
of WebTextView into setType().
Requires a change in external/webkit.
Grace Kloba [Fri, 4 Dec 2009 03:12:49 +0000 (19:12 -0800)]
Expose onReceivedSslError() so that the WebView client
can accept the error and continue.
Fix http://b/issue?id=
2299152
Android (Google) Code Review [Mon, 7 Dec 2009 21:05:46 +0000 (13:05 -0800)]
Merge change I234162b0 into eclair-mr2
* changes:
Add "res" support for WebView.
Android (Google) Code Review [Mon, 7 Dec 2009 21:02:56 +0000 (13:02 -0800)]
Merge change I3c256cf3 into eclair-mr2
* changes:
More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback.
Dave Sparks [Mon, 7 Dec 2009 21:01:01 +0000 (13:01 -0800)]
More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback.
Jason Sams [Mon, 7 Dec 2009 21:00:25 +0000 (13:00 -0800)]
am
fd2f6358: Merge change I771bebb9 into eclair
Merge commit '
fd2f6358321e95d661f24ba4e08327268035aa59' into eclair-mr2
* commit '
fd2f6358321e95d661f24ba4e08327268035aa59':
Add Java exceptions to catch RS calls with no context or no surface.
Android (Google) Code Review [Mon, 7 Dec 2009 20:55:38 +0000 (12:55 -0800)]
Merge change I771bebb9 into eclair
* changes:
Add Java exceptions to catch RS calls with no context or no surface.
Android (Google) Code Review [Mon, 7 Dec 2009 20:46:56 +0000 (12:46 -0800)]
Merge change I21eb4b87 into eclair-mr2
* changes:
Allow room for descenders in am/pm text.
Android (Google) Code Review [Mon, 7 Dec 2009 20:40:17 +0000 (12:40 -0800)]
Merge change Ic0e3ddf8 into eclair-mr2
* changes:
Remove unused Java object reference in native SoundPool code.
Jason Sams [Mon, 7 Dec 2009 20:40:12 +0000 (12:40 -0800)]
Add Java exceptions to catch RS calls with no context or no surface.
Eric Laurent [Mon, 7 Dec 2009 20:36:30 +0000 (12:36 -0800)]
am
0a08029f: Fix issue
2306779: Runtime restart - Init failed at android.media.ToneGenerator.
Merge commit '
0a08029fc9a370c6ef2a2a6fd1d800d9159b61f8' into eclair-mr2
* commit '
0a08029fc9a370c6ef2a2a6fd1d800d9159b61f8':
Fix issue
2306779: Runtime restart - Init failed at android.media.ToneGenerator.
Dave Sparks [Mon, 7 Dec 2009 20:36:20 +0000 (12:36 -0800)]
Remove unused Java object reference in native SoundPool code.
Grace Kloba [Mon, 7 Dec 2009 18:11:28 +0000 (10:11 -0800)]
Add "res" support for WebView.
http://b/issue?id=
2296839
Eric Laurent [Mon, 7 Dec 2009 18:53:10 +0000 (10:53 -0800)]
Fix issue
2306779: Runtime restart - Init failed at android.media.ToneGenerator.
The ToneGenerator failed to initialize because no more tracks were available in AudioFlinger mixer.
All tracks were used because the duplicating output was failing to free the tracks on audio hardware output mixer when exiting due to a misplaced test on output activity: output tracks where only freed if the duplicating output was active when exiting.
The fix consists in freeing the output tracks when the duplicating thread is destroyed without condition.
Andreas Huber [Mon, 7 Dec 2009 19:23:44 +0000 (11:23 -0800)]
Fixing the build, only instantiate the software aac decoder in full stagefright builds.
Android (Google) Code Review [Mon, 7 Dec 2009 19:03:28 +0000 (11:03 -0800)]
Merge change I9c6e1f90 into eclair-mr2
* changes:
Initial check in of stagefright software AAC decoder based on PV source code.
Eric Laurent [Mon, 7 Dec 2009 19:03:17 +0000 (11:03 -0800)]
am
6d42d806: Merge change I9cc489a2 into eclair
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.
Andreas Huber [Mon, 7 Dec 2009 17:56:32 +0000 (09:56 -0800)]
Initial check in of stagefright software AAC decoder based on PV source code.
Android (Google) Code Review [Mon, 7 Dec 2009 19:00:54 +0000 (11:00 -0800)]
Merge change I9cc489a2 into eclair
* changes:
Fix issue
2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
Yu Shan Emily Lau [Mon, 7 Dec 2009 18:54:38 +0000 (10:54 -0800)]
am
8445f367: Merge change Ibb9b1de1 into eclair
Merge commit '
8445f367070514dce3154be73827107b8a93f234' into eclair-mr2
* commit '
8445f367070514dce3154be73827107b8a93f234':
1) Capture the start memory before the test started
Android (Google) Code Review [Mon, 7 Dec 2009 18:51:16 +0000 (10:51 -0800)]
Merge change Ibb9b1de1 into eclair
* changes:
1) Capture the start memory before the test started 2) Report the mem diff to zero if it is negative.
Android (Google) Code Review [Mon, 7 Dec 2009 17:57:12 +0000 (09:57 -0800)]
Merge change I91eb0354 into eclair-mr2
* 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.
Andreas Huber [Mon, 7 Dec 2009 17:43:00 +0000 (09:43 -0800)]
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.
Leon Scroggins [Fri, 4 Dec 2009 19:50:18 +0000 (14:50 -0500)]
Show search icon for <input type="search"> fields.
Along with a change to external/webkit, fixes http://b/issue?id=
2299650
Android (Google) Code Review [Mon, 7 Dec 2009 15:14:41 +0000 (07:14 -0800)]
Merge change I9088d29b into eclair-mr2
* changes:
Improves the touch-based text selection UI in text boxes.
Daniel Sandler [Thu, 3 Dec 2009 16:46:03 +0000 (11:46 -0500)]
Allow room for descenders in am/pm text.
The lock screen clock layout was previously cropping them
off; in locales that use "PM" this is fine, but Spanish
(e.g.) uses "p.m."
Fixes http://b/
2277477
Eric Laurent [Sat, 5 Dec 2009 13:20:01 +0000 (05:20 -0800)]
Fix issue
2304669: VoiceIME: starting and canceling voice IME yields persistent "error 8" state on future attempts and breaks voice search.
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.
Dima Zavin [Mon, 7 Dec 2009 09:36:26 +0000 (01:36 -0800)]
am
0019215f: 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."
Dima Zavin [Mon, 7 Dec 2009 08:17:06 +0000 (00:17 -0800)]
Revert "When using MDP, we needed to use a texture for diming."
This reverts commit
bf0c320afbf6bf2441916755ecb443b64afbe73f.
Bjorn Bringert [Sat, 5 Dec 2009 21:40:46 +0000 (21:40 +0000)]
Rename SearchableInfo in preloaded-classes
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
Android (Google) Code Review [Sat, 5 Dec 2009 18:21:01 +0000 (10:21 -0800)]
Merge change I9589f9c2 into eclair-mr2
* changes:
Move android.server.search.SearchableInfo to android.app
Android (Google) Code Review [Sat, 5 Dec 2009 01:01:54 +0000 (17:01 -0800)]
Merge change I4039545e into eclair-mr2
* changes:
Fire OnGroupClick events when collapsing a group in ExpandableListView.
Romain Guy [Sat, 5 Dec 2009 00:51:52 +0000 (16:51 -0800)]
Fire OnGroupClick events when collapsing a group in ExpandableListView.
Android (Google) Code Review [Sat, 5 Dec 2009 00:46:28 +0000 (16:46 -0800)]
Merge change I5f1d2d24 into eclair-mr2
* changes:
move event log tags used by ActivityManager into this package
Doug Zongker [Fri, 4 Dec 2009 20:52:44 +0000 (12:52 -0800)]
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.
Android (Google) Code Review [Fri, 4 Dec 2009 23:59:59 +0000 (15:59 -0800)]
Merge change I88721afe into eclair-mr2
* changes:
Fix bitmask in aapt's StringPool length construction
Android (Google) Code Review [Fri, 4 Dec 2009 23:55:47 +0000 (15:55 -0800)]
Merge changes Id682ab72,I9bb4dbae into eclair-mr2
* 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.
Android (Google) Code Review [Fri, 4 Dec 2009 23:50:43 +0000 (15:50 -0800)]
Merge change If3c7d429 into eclair-mr2
* changes:
Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
Android (Google) Code Review [Fri, 4 Dec 2009 23:39:59 +0000 (15:39 -0800)]
Merge change Iaad9c8d1 into eclair-mr2
* changes:
Restore 7.xml.
Romain Guy [Fri, 4 Dec 2009 23:38:22 +0000 (15:38 -0800)]
Report SCROLL_STATE_IDLE after the user finishes a scroll (not a fling.)
When the user lifts her finger up, AbsListView computes the fling velocity
and report a SCROLL_STATE_FLING if the velocity is high enough. However,
when the fling is not initiated because the velocity is too low (case of
a normal scroll), the idle state was not set nor reported.
Suchi Amalapurapu [Fri, 4 Dec 2009 23:01:49 +0000 (15:01 -0800)]
am
ae952b3b: Merge change Ibe1c422a into eclair
Merge commit '
ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7' into eclair-mr2
* commit '
ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7':
If the usage stats file doesn't exist in the first place there is no need to
Android (Google) Code Review [Fri, 4 Dec 2009 22:59:43 +0000 (14:59 -0800)]
Merge change Ibe1c422a into eclair
* changes:
If the usage stats file doesn't exist in the first place there is no need to backup and short return.
Yu Shan Emily Lau [Fri, 4 Dec 2009 22:13:00 +0000 (14:13 -0800)]
1) Capture the start memory before the test started
2) Report the mem diff to zero if it is negative.
Suchi Amalapurapu [Fri, 4 Dec 2009 20:31:13 +0000 (12:31 -0800)]
If the usage stats file doesn't exist in the first place there is no need to
backup and short return.
Kenny Root [Fri, 21 Aug 2009 20:23:45 +0000 (15:23 -0500)]
Fix bitmask in aapt's StringPool length construction
The StringPool indicates the length of a string with a 16-bit
integer. If the length of the string is greater than 0x7FFF,
it splits it into two 16-bit integers with the first one
having the high bit set.
The length calculation has a small bug that masks off the
19 bits instead of the first 15 bits as intended.
Android (Google) Code Review [Fri, 4 Dec 2009 21:36:57 +0000 (13:36 -0800)]
Merge change Ifef6435a into eclair-mr2
* changes:
Enable proper cleanup of OMX nodes managed through stagefright.
Christopher Tate [Fri, 4 Dec 2009 20:54:36 +0000 (12:54 -0800)]
am
d3bc1994: Merge change I397b6a93 into eclair
Merge commit '
d3bc1994b0c2c5e9c60fa748de47eebbe1984fda' into eclair-mr2
* commit '
d3bc1994b0c2c5e9c60fa748de47eebbe1984fda':
Don't accidentally signal multiple exceptions in setThreadPriority()
Andreas Huber [Fri, 4 Dec 2009 20:52:40 +0000 (12:52 -0800)]
Enable proper cleanup of OMX nodes managed through stagefright.
Android (Google) Code Review [Fri, 4 Dec 2009 20:51:44 +0000 (12:51 -0800)]
Merge change I397b6a93 into eclair
* changes:
Don't accidentally signal multiple exceptions in setThreadPriority()
Andy McFadden [Fri, 4 Dec 2009 20:35:50 +0000 (12:35 -0800)]
Restore 7.xml.
Deletion of "unused" opcode constants should only have happened in
8.xml.
Android (Google) Code Review [Fri, 4 Dec 2009 20:00:13 +0000 (12:00 -0800)]
Merge change Iab5c49c7 into eclair-mr2
* changes:
move event log tags used by system server into this package
Ray Chen [Fri, 4 Dec 2009 19:57:10 +0000 (11:57 -0800)]
am
052d9c8b: Images.Media.DATE_TAKEN should be in milliseconds. b/
2297371
Merge commit '
052d9c8b414dc9eb1c70d849660592d9bc3b2644' into eclair-mr2
* commit '
052d9c8b414dc9eb1c70d849660592d9bc3b2644':
Images.Media.DATE_TAKEN should be in milliseconds.
Ray Chen [Fri, 4 Dec 2009 09:47:07 +0000 (01:47 -0800)]
Images.Media.DATE_TAKEN should be in milliseconds.
http://b/
2297371
Android (Google) Code Review [Fri, 4 Dec 2009 19:51:05 +0000 (11:51 -0800)]
Merge change If32b488b into eclair-mr2
* changes:
Add new unit test for RadioGroup/RadioButton.
Romain Guy [Fri, 4 Dec 2009 19:50:22 +0000 (11:50 -0800)]
Add new unit test for RadioGroup/RadioButton.
Also fix the AutoCompleteTextViewCallbacks test.
Android (Google) Code Review [Fri, 4 Dec 2009 19:20:54 +0000 (11:20 -0800)]
Merge change Ie46db339 into eclair-mr2
* changes:
Remove "unused" opcodes from API.
Android (Google) Code Review [Fri, 4 Dec 2009 19:08:28 +0000 (11:08 -0800)]
Merge change I4261c58d into eclair-mr2
* changes:
Check if another Activity wants to intercept an xml mime type.
Christopher Tate [Fri, 4 Dec 2009 19:05:12 +0000 (11:05 -0800)]
Don't accidentally signal multiple exceptions in setThreadPriority()
After signalling an exception due to set_sched_policy() failing (probably
because the thread in question had exited before this function was called), we
proceeded to call setpriority() anyway, and raised *another* exception when it
also failed. We don't do this any more; we just bail after signalling the first
exception.
Change-Id: I397b6a93c73d3f0870176e26759f2bec33e56205
Romain Guy [Fri, 4 Dec 2009 18:37:59 +0000 (10:37 -0800)]
am
48a65d99: Merge change I8c5f2fc3 into eclair
Merge commit '
48a65d99cba33db3af2e05982a6825b883be2030' into eclair-mr2
* commit '
48a65d99cba33db3af2e05982a6825b883be2030':
Fix invalidate code path (#
2273209).
Doug Zongker [Fri, 4 Dec 2009 18:31:43 +0000 (10:31 -0800)]
move event log tags used by system server 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.
Android (Google) Code Review [Fri, 4 Dec 2009 18:22:47 +0000 (10:22 -0800)]
Merge change I8c5f2fc3 into eclair
* changes:
Fix invalidate code path (#
2273209).
Romain Guy [Fri, 4 Dec 2009 01:13:02 +0000 (17:13 -0800)]
Fix invalidate code path (#
2273209).
Cached views would, in some situations, not update if they contained an
animating child. This was caused by clearing the dirty cache flag too
early in View.buildDrawingCache().
Approved by Dr. No mcleron.
Change-Id: I8c5f2fc3e6605657e0da625d60d50b55bb133666
Patrick Scott [Mon, 30 Nov 2009 18:34:40 +0000 (13:34 -0500)]
Check if another Activity wants to intercept an xml mime type.
WebCore treats */*+xml as content that it can render. This prevents Activities
from intercepting those mime types. Check the same regular expression as
DOMImplementation and then use the PackageManager to look for a matching
Activity.
Requires a change to webcore.
Bug:
2256744
Andy McFadden [Fri, 4 Dec 2009 16:56:54 +0000 (08:56 -0800)]
Remove "unused" opcodes from API.
There's no need to have constants like OP_UNUSED_FF in the API. They
serve no purpose, and it makes life confusing when an opcode is defined
(does the "unused" one go away, breaking the API? do we have the real
definition and the "unused" definition simultaneously?).
Discussed / approved by API council.
Bjorn Bringert [Thu, 3 Dec 2009 15:48:19 +0000 (15:48 +0000)]
Move android.server.search.SearchableInfo to android.app
We need to expose SearchableInfo in the SDK in order to unbundle
Quick Search Box. Since the android.server.search package is
hidden, I'm moving SearchableInfo to android.app, where
SearchManager lives.
This change doesn't actually expose SearchableInfo. I'll do
that in a separate change to keep the change that
api-council needs to review small.
This is part of the fix for: http://b/issue?id=
2270838
Change-Id: I9589f9c2c11d36c958beedff8245fe0c3319c6ba
Jack Palevich [Fri, 4 Dec 2009 09:15:07 +0000 (17:15 +0800)]
Improve error message thrown when eglCreateContext fails.
Jack Palevich [Fri, 4 Dec 2009 09:07:31 +0000 (17:07 +0800)]
Improve error reporting by always returning the public
EGL10.EGL_NO_XXX objects for displays, surfaces, and contexts.
This allows clients to compare the returned object against
the public EGL10.EGL_NO_XXX object using a simple == operation.
This fixes bug
2303947 "Java layer EGL API makes it difficult
to tell when certain methods have failed"
Daisuke Miyakawa [Wed, 21 Oct 2009 23:36:42 +0000 (08:36 +0900)]
Implement new MockContentProvider. Also make ContentProvider aware of the class.
Rename the old MockContentProvider to MockIContentProvider since it is
more appropriate name.
Detail:
Current developers inevitably depend on the backend used by ContentProvider,
which is useful but not ideal nor "testable" from the view of them.
Current MockContentResolver only accepts exact "ContentProvider" class, not
IContentProvider interface, since we want to hide "IContentProvider" while
the old MockContentProvider implements IContentProvider and as a result some
methods we want to hide may be exposed to the public SDK now and probably
for the future.
On the other hand, ContentProvider is not interface but an exact class
heavily depends on the internal logic and not suitable for external
developers to use for tests.
The new MockContentProvider introduces the mock implementation
for ContentProvider.
It extends ContentProvider, so "is" ContentProvider, but tries to avoid
depending on any backend System like IPC in Android, etc.
This should be useful from the view of application developers who do not
want to be confused with ContentProvider/ContentResolver backend
implementation "at all" and want to use MockContentResolver without
any other ContentProvider implementations tightly connected to the
external worlds.
Jim Miller [Fri, 4 Dec 2009 06:18:24 +0000 (22:18 -0800)]
am
1296d562: Merge change I8b63ab66 into eclair
Merge commit '
1296d562cf9b80e439724e15b4fdaf6626d2b4df' into eclair-mr2
* commit '
1296d562cf9b80e439724e15b4fdaf6626d2b4df':
Better animation for sliding widget.
Android (Google) Code Review [Fri, 4 Dec 2009 06:14:19 +0000 (22:14 -0800)]
Merge change I8b63ab66 into eclair
* changes:
Better animation for sliding widget.
Android (Google) Code Review [Fri, 4 Dec 2009 04:03:59 +0000 (20:03 -0800)]
Merge change I6c84d731 into eclair-mr2
* changes:
Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
Dianne Hackborn [Fri, 4 Dec 2009 00:41:59 +0000 (16:41 -0800)]
Add API level 8, currently a copy of 7.
Fred Quintana [Fri, 4 Dec 2009 01:17:00 +0000 (17:17 -0800)]
am
0ce8431c: Merge change Iaa7edda4 into eclair
Merge commit '
0ce8431c15078e095a22a123dbabcd91049a9652' into eclair-mr2
* commit '
0ce8431c15078e095a22a123dbabcd91049a9652':
don't reschedule syncs that failed with a tooManyRetries error
Android (Google) Code Review [Fri, 4 Dec 2009 01:10:59 +0000 (17:10 -0800)]
Merge change Iaa7edda4 into eclair
* changes:
don't reschedule syncs that failed with a tooManyRetries error
Android (Google) Code Review [Fri, 4 Dec 2009 00:27:16 +0000 (16:27 -0800)]
Merge change I85e5d39e into eclair-mr2
* changes:
Two more uses of strlcpy that break the sim build. Now fixed.
Jason Sams [Fri, 4 Dec 2009 00:23:23 +0000 (16:23 -0800)]
am
5c49a908: (-s ours) Merge change Ic73ec39b into eclair
Merge commit '
5c49a9080df9e46193efa8326318c86bc8976eea' into eclair-mr2
* commit '
5c49a9080df9e46193efa8326318c86bc8976eea':
DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices. If we see a 0 texture id during bind for rendering, attempt to re-upload. If this fails log debug info and restart the app.
Andreas Huber [Fri, 4 Dec 2009 00:22:52 +0000 (16:22 -0800)]
Two more uses of strlcpy that break the sim build. Now fixed.
Android (Google) Code Review [Fri, 4 Dec 2009 00:15:46 +0000 (16:15 -0800)]
Merge change Ic73ec39b into eclair
* changes:
DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices. If we see a 0 texture id during bind for rendering, attempt to re-upload. If this fails log debug info and restart the app.
Scott Main [Fri, 4 Dec 2009 00:14:13 +0000 (16:14 -0800)]
Merge branch 'eclair-mr2' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2
Scott Main [Fri, 4 Dec 2009 00:13:19 +0000 (16:13 -0800)]
am
5d0806c9: Merge change Ia70bd8c4 into eclair
Merge commit '
5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6' into eclair-mr2
* commit '
5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6':
add BluetoothChat sample app to the dev guide
Andreas Huber [Fri, 4 Dec 2009 00:07:05 +0000 (16:07 -0800)]
Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
Android (Google) Code Review [Fri, 4 Dec 2009 00:06:52 +0000 (16:06 -0800)]
Merge change Ia70bd8c4 into eclair
* changes:
add BluetoothChat sample app to the dev guide
Android (Google) Code Review [Thu, 3 Dec 2009 23:51:09 +0000 (15:51 -0800)]
Merge change I1f1c7bad into eclair-mr2
* changes:
I accidentally broke this code while refactoring MediaScanner. This is the fix.
Andreas Huber [Thu, 3 Dec 2009 23:45:53 +0000 (15:45 -0800)]
I accidentally broke this code while refactoring MediaScanner. This is the fix.
Jason Sams [Thu, 3 Dec 2009 23:43:18 +0000 (15:43 -0800)]
DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices. If we see a 0 texture id during bind for rendering, attempt to re-upload. If this fails log debug info and restart the app.
Scott Main [Wed, 2 Dec 2009 23:42:30 +0000 (15:42 -0800)]
add BluetoothChat sample app to the dev guide
Erik Gilling [Thu, 3 Dec 2009 23:35:55 +0000 (15:35 -0800)]
am
cef8d031: Merge change I00d0b54a into eclair
Merge commit '
cef8d031e842b773bbd6481b517996a185391e92' into eclair-mr2
* commit '
cef8d031e842b773bbd6481b517996a185391e92':
surfaceflinger: remove un-cached buffer hack for SGX
Android (Google) Code Review [Thu, 3 Dec 2009 23:30:23 +0000 (15:30 -0800)]
Merge change I00d0b54a into eclair
* changes:
surfaceflinger: remove un-cached buffer hack for SGX
Dianne Hackborn [Thu, 3 Dec 2009 22:52:46 +0000 (14:52 -0800)]
Fred Quintana [Thu, 3 Dec 2009 22:18:58 +0000 (14:18 -0800)]
don't reschedule syncs that failed with a tooManyRetries error
Dianne Hackborn [Thu, 3 Dec 2009 22:13:53 +0000 (14:13 -0800)]
Add API level 7.
Change-Id: Id87dc724f0758ce0faee9c00621d4af6cb9f5bd9
Erik Gilling [Thu, 3 Dec 2009 22:08:19 +0000 (14:08 -0800)]
surfaceflinger: remove un-cached buffer hack for SGX
Signed-off-by: Erik Gilling <konkers@android.com>
Android (Google) Code Review [Thu, 3 Dec 2009 21:55:07 +0000 (13:55 -0800)]
Merge change I6173d7c7 into eclair-mr2
* changes:
Add isPrintableAscii() and isPrintableAsciiOnly() to TextUtils.java as hidden methods, and make vCard code use them.
Android (Google) Code Review [Thu, 3 Dec 2009 21:27:08 +0000 (13:27 -0800)]
Merge change I74bf38a0 into eclair-mr2
* changes:
Squashed commit of the following:
Andreas Huber [Thu, 3 Dec 2009 19:31:19 +0000 (11:31 -0800)]
Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
Andreas Huber [Thu, 3 Dec 2009 19:39:54 +0000 (11:39 -0800)]
Squashed commit of the following:
commit
543e192bf2ae13f573dc4c4e53b239ed4ea00e81
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 3 11:33:57 2009 -0800
stagefright now acts as the OMX Master, vendors supply their own plugins through libstagefrighthw. In OpenCore-enabled builds we now sit on top of PVMaster...
commit
3cbfdbd9cecadbb77b63125c62883bf1065884fe
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 2 12:39:07 2009 -0800
More OMX infrastructure, stagefright is now taking over the OMX Master, multiplexing all contributing OMX implementations under a common interface.