OSDN Git Service
Daisuke Miyakawa [Tue, 3 Nov 2009 08:30:19 +0000 (17:30 +0900)]
Rename the term "attribute"/"attr" to "parameter"/param".
We had been using "parameter"/"param" by mistake, while both vCard
formats uses theterm "attribute"/"attr". This is confusing.
Internal issue number:
2233884
Daisuke Miyakawa [Tue, 3 Nov 2009 06:56:38 +0000 (15:56 +0900)]
Move some useful logic to VCardTestsBase.java
Internal issue number:
2195990
Dirk Dougherty [Tue, 3 Nov 2009 02:24:29 +0000 (18:24 -0800)]
am
483d29c0: am
671c61d6: Merge change Iaf5d2cc2 into eclair-sdk
Merge commit '
483d29c0ddc9f4c110a8a8788ccd978010d55aa4' into eclair-mr2
* commit '
483d29c0ddc9f4c110a8a8788ccd978010d55aa4':
doc change: misc doc fixes.
Dirk Dougherty [Tue, 3 Nov 2009 02:17:26 +0000 (18:17 -0800)]
am
671c61d6: Merge change Iaf5d2cc2 into eclair-sdk
Merge commit '
671c61d66f8d556f206d167d0f3c3bbe037ed86b' into eclair
* commit '
671c61d66f8d556f206d167d0f3c3bbe037ed86b':
doc change: misc doc fixes.
Android (Google) Code Review [Tue, 3 Nov 2009 02:05:30 +0000 (21:05 -0500)]
Merge change Iaf5d2cc2 into eclair-sdk
* changes:
doc change: misc doc fixes.
James Dong [Tue, 3 Nov 2009 01:19:51 +0000 (17:19 -0800)]
am
f67eff17: Merge change Ib0036762 into eclair
Merge commit '
f67eff177515baa421d8717ee20efdc516fde580' into eclair-mr2
* commit '
f67eff177515baa421d8717ee20efdc516fde580':
Add windows media support check in MediaMetadataRetrieverTest
Brett Chabot [Tue, 3 Nov 2009 01:15:02 +0000 (17:15 -0800)]
am
d6af2e0c: (-s ours) Merge change I43a335c3 into eclair
Merge commit '
d6af2e0cbf144b091d9c9d1bf2f3061547220c80' into eclair-mr2
* commit '
d6af2e0cbf144b091d9c9d1bf2f3061547220c80':
Suppress takePicture test from continuous DO NOT MERGE.
Brett Chabot [Tue, 3 Nov 2009 01:14:54 +0000 (17:14 -0800)]
am
774d956d: Merge change Ic8c7ca7b into eclair
Merge commit '
774d956d5d2f6bece15c10c0db275596148c7ef8' into eclair-mr2
* commit '
774d956d5d2f6bece15c10c0db275596148c7ef8':
Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
Android (Google) Code Review [Tue, 3 Nov 2009 01:13:20 +0000 (20:13 -0500)]
Merge change Ib0036762 into eclair
* changes:
Add windows media support check in MediaMetadataRetrieverTest bug
2232274
Android (Google) Code Review [Tue, 3 Nov 2009 01:08:16 +0000 (20:08 -0500)]
Merge change I43a335c3 into eclair
* changes:
Suppress takePicture test from continuous DO NOT MERGE.
Android (Google) Code Review [Tue, 3 Nov 2009 01:07:11 +0000 (20:07 -0500)]
Merge change Ic8c7ca7b into eclair
* changes:
Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
Dima Zavin [Tue, 3 Nov 2009 01:04:57 +0000 (17:04 -0800)]
am
dfc7244a: libbinder: MemoryHeapPmem: honor the NO_CACHING flag when creating a client heap
Merge commit '
dfc7244aa874ae31cc13758e1e2cf6112f7a66b4' into eclair-mr2
* commit '
dfc7244aa874ae31cc13758e1e2cf6112f7a66b4':
libbinder: MemoryHeapPmem: honor the NO_CACHING flag when creating a client heap
Dima Zavin [Tue, 3 Nov 2009 00:02:43 +0000 (16:02 -0800)]
libbinder: MemoryHeapPmem: honor the NO_CACHING flag when creating a client heap
Change-Id: Ia7beb800f5a24beaa4b7f3032b486d4ed1991b23
Signed-off-by: Dima Zavin <dima@android.com>
Jaikumar Ganesh [Mon, 2 Nov 2009 23:54:35 +0000 (15:54 -0800)]
am
a229ceda: (-s ours) Merge change I73d6c0f8 into eclair
Merge commit '
a229cedadd6c3b8ab7f2d8b7b45638753e834992' into eclair-mr2
* commit '
a229cedadd6c3b8ab7f2d8b7b45638753e834992':
Add ability to disable sending Photos using Vcard. Do Not Merge
Android (Google) Code Review [Mon, 2 Nov 2009 23:46:04 +0000 (18:46 -0500)]
Merge change I73d6c0f8 into eclair
* changes:
Add ability to disable sending Photos using Vcard. Do Not Merge
Jason Sams [Mon, 2 Nov 2009 23:11:37 +0000 (15:11 -0800)]
am
03e778b9: Merge change Ic4918c30 into eclair
Merge commit '
03e778b913adfb450889c51adf042388ada7c5f8' into eclair-mr2
* commit '
03e778b913adfb450889c51adf042388ada7c5f8':
Fix a build break. Too many branches to keep track of.
Android (Google) Code Review [Mon, 2 Nov 2009 23:05:55 +0000 (18:05 -0500)]
Merge change Ic4918c30 into eclair
* changes:
Fix a build break. Too many branches to keep track of.
Jason Sams [Mon, 2 Nov 2009 23:05:04 +0000 (15:05 -0800)]
Fix a build break. Too many branches to keep track of.
Iliyan Malchev [Mon, 2 Nov 2009 23:01:36 +0000 (15:01 -0800)]
am
d4649b2f: Merge change Ibaef6141 into eclair
Merge commit '
d4649b2f8ea8285a4eb3c47e87520c7835e6c672' into eclair-mr2
* commit '
d4649b2f8ea8285a4eb3c47e87520c7835e6c672':
libbinder: add a NO_CACHING flag to MemoryHeapBase
Android (Google) Code Review [Mon, 2 Nov 2009 22:55:43 +0000 (17:55 -0500)]
Merge change Ibaef6141 into eclair
* changes:
libbinder: add a NO_CACHING flag to MemoryHeapBase
Marco Nelissen [Mon, 2 Nov 2009 22:41:28 +0000 (14:41 -0800)]
am
1d9246e8: Merge change Id095e180 into eclair
Merge commit '
1d9246e8bb8de624e14c55dce57e93da18cfd7a8' into eclair-mr2
* commit '
1d9246e8bb8de624e14c55dce57e93da18cfd7a8':
Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
Jason Sams [Mon, 2 Nov 2009 22:41:21 +0000 (14:41 -0800)]
am
3bbb5e9a: Merge change Ib7a6c434 into eclair
Merge commit '
3bbb5e9a1e792795dc6965dd399ef78d4e6556cd' into eclair-mr2
* commit '
3bbb5e9a1e792795dc6965dd399ef78d4e6556cd':
Fix some leaks. This fixes the major malloc memory leak in allApps. Still tracking some much more minor issues.
Android (Google) Code Review [Mon, 2 Nov 2009 22:36:52 +0000 (17:36 -0500)]
Merge change Id095e180 into eclair
* changes:
Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
Android (Google) Code Review [Mon, 2 Nov 2009 22:31:15 +0000 (17:31 -0500)]
Merge change Ib7a6c434 into eclair
* changes:
Fix some leaks. This fixes the major malloc memory leak in allApps. Still tracking some much more minor issues.
Jason Sams [Mon, 2 Nov 2009 22:25:10 +0000 (14:25 -0800)]
Fix some leaks. This fixes the major malloc memory leak in allApps. Still tracking some much more minor issues.
Dan Egnor [Mon, 2 Nov 2009 22:05:04 +0000 (14:05 -0800)]
am
afd81beb: Merge change Icbb3aa0a into eclair
Merge commit '
afd81beb33cce3b296927d13821fe0dc874ce7db' into eclair-mr2
* commit '
afd81beb33cce3b296927d13821fe0dc874ce7db':
Use setRepeating() rather than setInexactRepeating() for backup scheduling,
Android (Google) Code Review [Mon, 2 Nov 2009 21:58:26 +0000 (16:58 -0500)]
Merge change Icbb3aa0a into eclair
* changes:
Use setRepeating() rather than setInexactRepeating() for backup scheduling, and add some random fuzz to the scheduling times, to make sure we aren't creating hour-aligned server load spikes.
Marco Nelissen [Mon, 2 Nov 2009 21:52:11 +0000 (13:52 -0800)]
Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
Joe Onorato [Mon, 2 Nov 2009 21:38:13 +0000 (13:38 -0800)]
am
cce9f0fa: Merge change I0d7dc3b8 into eclair
Merge commit '
cce9f0fa862b6fa9de8dbf5a7a7b63167770a9b3' into eclair-mr2
* commit '
cce9f0fa862b6fa9de8dbf5a7a7b63167770a9b3':
Fix notification bar performance.
Android (Google) Code Review [Mon, 2 Nov 2009 21:29:31 +0000 (16:29 -0500)]
Merge change I0d7dc3b8 into eclair
* changes:
Fix notification bar performance.
Joe Onorato [Mon, 2 Nov 2009 21:20:44 +0000 (16:20 -0500)]
Fix notification bar performance.
Bug
2195678
We had all this stuff there to keep the notification view
around so it doesn't need to be reconstructed each time,
and we weren't using it. This fixes that, and it looks
much better now.
Eric Laurent [Mon, 2 Nov 2009 20:40:34 +0000 (12:40 -0800)]
am
ee98c240: Merge change I73680cd9 into eclair
Merge commit '
ee98c24020c1634b02cde6d333968f04a0de941f' into eclair-mr2
* commit '
ee98c24020c1634b02cde6d333968f04a0de941f':
Fix
2194140: [Passion] Support Audience chip.
Android (Google) Code Review [Mon, 2 Nov 2009 20:34:28 +0000 (15:34 -0500)]
Merge change I73680cd9 into eclair
* changes:
Fix
2194140: [Passion] Support Audience chip.
James Dong [Mon, 2 Nov 2009 20:11:57 +0000 (12:11 -0800)]
Add windows media support check in MediaMetadataRetrieverTest
bug
2232274
Mike Lockwood [Mon, 2 Nov 2009 19:48:54 +0000 (11:48 -0800)]
am
989b76aa: Merge change Ieca126e6 into eclair
Merge commit '
989b76aadd92538c7ab4ca00c34508b42fda8cef' into eclair-mr2
* commit '
989b76aadd92538c7ab4ca00c34508b42fda8cef':
Fix problem with proximity sensor not reawaking screen if the values change too quickly.
Android (Google) Code Review [Mon, 2 Nov 2009 19:42:25 +0000 (14:42 -0500)]
Merge change Ieca126e6 into eclair
* changes:
Fix problem with proximity sensor not reawaking screen if the values change too quickly.
Mike Lockwood [Mon, 2 Nov 2009 19:17:57 +0000 (14:17 -0500)]
Fix problem with proximity sensor not reawaking screen if the values change too quickly.
The logic that disables user activity while turning off the screen should not affect proximity sensor.
Fixes bug b/
2228734 (in-call, prox sensor gets confused)
Change-Id: Ieca126e6f79bf7baa5741981aea72d306ba03edc
Signed-off-by: Mike Lockwood <lockwood@android.com>
Dianne Hackborn [Mon, 2 Nov 2009 18:52:22 +0000 (10:52 -0800)]
am
b6a6791f: Merge change I60413727 into eclair
Merge commit '
b6a6791f381691d4a58fe6972eb9f0b65308ac1f' into eclair-mr2
* commit '
b6a6791f381691d4a58fe6972eb9f0b65308ac1f':
Fix issue #
2226370: Resource versions match with equality
Android (Google) Code Review [Mon, 2 Nov 2009 18:43:52 +0000 (13:43 -0500)]
Merge change I60413727 into eclair
* changes:
Fix issue #
2226370: Resource versions match with equality
Eric Laurent [Mon, 2 Nov 2009 13:31:33 +0000 (05:31 -0800)]
Fix
2194140: [Passion] Support Audience chip.
Added new input device DEVICE_IN_BACK_MIC.
Added new audio source AUDIO_SOURCE_CAMCORDER.
Eric Laurent [Mon, 2 Nov 2009 18:11:25 +0000 (10:11 -0800)]
am
31f62008: Merge change I29bc113c into eclair
Merge commit '
31f62008db4b2c3bfd24379b76570fd9bd1de2b3' into eclair-mr2
* commit '
31f62008db4b2c3bfd24379b76570fd9bd1de2b3':
Fix issue 197683: English IME key-press latency is noticeably higher on passion than sholes. Part 2.
Mike Lockwood [Mon, 2 Nov 2009 18:11:17 +0000 (10:11 -0800)]
am
f1d14f6a: Do not advance mLastEventTime when enabling or disabling user activity.
Merge commit '
f1d14f6a33bc6086db52a77b6a1217452b7eac90' into eclair-mr2
* commit '
f1d14f6a33bc6086db52a77b6a1217452b7eac90':
Do not advance mLastEventTime when enabling or disabling user activity.
Android (Google) Code Review [Mon, 2 Nov 2009 18:05:08 +0000 (13:05 -0500)]
Merge change I29bc113c into eclair
* changes:
Fix issue 197683: English IME key-press latency is noticeably higher on passion than sholes. Part 2.
Mike Lockwood [Mon, 2 Nov 2009 16:56:04 +0000 (11:56 -0500)]
Do not advance mLastEventTime when enabling or disabling user activity.
Fixes a race condition between the keyguard and power key that sometimes resulted
in the power key failing to turn off the screen.
Fixes bug b/
2212852 (Power button does not put phone to sleep)
Change-Id: I92498c5fddf2bfc32b105ea1a7ea14a06d83888e
Signed-off-by: Mike Lockwood <lockwood@android.com>
Eric Laurent [Fri, 30 Oct 2009 18:09:39 +0000 (11:09 -0700)]
Fix issue 197683: English IME key-press latency is noticeably higher on passion than sholes. Part 2.
Reduce sleep time in AudioFlinger mixer thread when no data has been written to output to speed up startup time when exiting standby.
The rest of the modifications for this issues is in kernel driver:
commit
0dbb0ee136ed8de757df1ae26d84556c1751deae for buffer size modification from 8192 to 4800 bytes.
Another kernel improvement that is not submitted yes will reduce delay when audio output is exiting standby.
Daisuke Miyakawa [Mon, 2 Nov 2009 06:21:37 +0000 (15:21 +0900)]
Enable vCard tests connect both importer/exporter tests.
Fix a bug in ContactStruct.
Internal issue number:
2195990
Dianne Hackborn [Mon, 2 Nov 2009 05:16:59 +0000 (21:16 -0800)]
Fix issue #
2226370: Resource versions match with equality
Also fixed turned-around increment of version number for resources. :(
Change-Id: I604137272da984bcd69cee4f174e6b7f2c786e46
Mike Lockwood [Sun, 1 Nov 2009 15:15:27 +0000 (07:15 -0800)]
am
9efd523c: Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
Merge commit '
9efd523c4611c0cf10e712453a699c083a01064c' into eclair-mr2
* commit '
9efd523c4611c0cf10e712453a699c083a01064c':
Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
Mike Lockwood [Sun, 1 Nov 2009 15:15:20 +0000 (07:15 -0800)]
am
4984e73d: Manage button and keyboard backlights with light sensor in both manual and automatic mode.
Merge commit '
4984e73dc5fc3df757e4ac8dd333b88151deb3ea' into eclair-mr2
* commit '
4984e73dc5fc3df757e4ac8dd333b88151deb3ea':
Manage button and keyboard backlights with light sensor in both manual and automatic mode.
Mike Lockwood [Sun, 1 Nov 2009 15:05:50 +0000 (10:05 -0500)]
Add warning that hardware auto-brightness is deprecated and will be removed in the next release.
Change-Id: I90eae78f71f377f6479d0aaf7ced38a7b988a7ee
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Sun, 1 Nov 2009 13:31:44 +0000 (05:31 -0800)]
am
df024920: Don\'t turn on keyboard backlights when keyboard is closed in auto brightness mode.
Merge commit '
df024920ebc63a82f570105c7a26e339ff244afd' into eclair-mr2
* commit '
df024920ebc63a82f570105c7a26e339ff244afd':
Don't turn on keyboard backlights when keyboard is closed in auto brightness mode.
Mike Lockwood [Sun, 1 Nov 2009 13:31:36 +0000 (05:31 -0800)]
am
aa66ea88: Use separate flags for enabling hardware and software auto-brightness.
Merge commit '
aa66ea880f58c9caa49e31c166bb3bd6bbf14e21' into eclair-mr2
* commit '
aa66ea880f58c9caa49e31c166bb3bd6bbf14e21':
Use separate flags for enabling hardware and software auto-brightness.
Mike Lockwood [Sun, 1 Nov 2009 13:16:33 +0000 (08:16 -0500)]
Manage button and keyboard backlights with light sensor in both manual and automatic mode.
Now the manual brightness mode only applies to the LCD backlight and
button and keyboard backlights are always managed automatically.
Fixes bug b/
2195798 (Passion capacitive key backlights don't always come on)
This change only affects the framework based auto-brightness implementation.
Hardware auto-brightness is not affected.
Change-Id: Ib88310d642d498591e8879c8269d630ff3f7c8af
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Fri, 30 Oct 2009 01:29:15 +0000 (21:29 -0400)]
Don't turn on keyboard backlights when keyboard is closed in auto brightness mode.
For framework light sensor support (does not affect hardware based approach).
Change-Id: I6896a7c5b3fd3ed136c4f25c63a0e5813c349f68
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Sat, 31 Oct 2009 20:31:27 +0000 (16:31 -0400)]
Use separate flags for enabling hardware and software auto-brightness.
This cleans up the code in preparation for some other auto-brightness changes
and fixes support for devices without light sensors.
Change-Id: I3d4802cf860a865ffd86a8bb57cd57b46359433d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Dirk Dougherty [Sat, 31 Oct 2009 02:05:53 +0000 (19:05 -0700)]
doc change: misc doc fixes.
Bug:
2160782
Change-Id: Iaf5d2cc2e3c657700469e8b7394a95bc03fc26f3
Iliyan Malchev [Sat, 31 Oct 2009 01:35:51 +0000 (18:35 -0700)]
am
05cb5610: Merge change I8c0eb9a6 into eclair
Merge commit '
05cb5610fdfb7b69cf90a9230853e59b4ae5e219' into eclair-mr2
* commit '
05cb5610fdfb7b69cf90a9230853e59b4ae5e219':
libagl: silence a LOGD
Iliyan Malchev [Fri, 30 Oct 2009 05:55:00 +0000 (22:55 -0700)]
libbinder: add a NO_CACHING flag to MemoryHeapBase
The NO_CACHING flag translates to opening a memory region with O_SYNC.
Signed-off-by: Iliyan Malchev <malchev@google.com>
Android (Google) Code Review [Sat, 31 Oct 2009 01:29:56 +0000 (21:29 -0400)]
Merge change I8c0eb9a6 into eclair
* changes:
libagl: silence a LOGD
Iliyan Malchev [Sat, 31 Oct 2009 01:29:08 +0000 (18:29 -0700)]
libagl: silence a LOGD
Signed-off-by: Iliyan Malchev <malchev@google.com>
Mike LeBeau [Sat, 31 Oct 2009 01:22:00 +0000 (18:22 -0700)]
am
d3e4dab9: Merge change I7df84618 into eclair
Merge commit '
d3e4dab962109c634196bc38fb9830c7b8cc1d0a' into eclair-mr2
* commit '
d3e4dab962109c634196bc38fb9830c7b8cc1d0a':
Add a privateImeOption to represent that the IME should not show
Dan Egnor [Sat, 31 Oct 2009 00:35:39 +0000 (17:35 -0700)]
Use setRepeating() rather than setInexactRepeating() for backup scheduling,
and add some random fuzz to the scheduling times, to make sure we aren't
creating hour-aligned server load spikes.
See bug
2226553 for details & Dr. No information.
Android (Google) Code Review [Sat, 31 Oct 2009 01:12:00 +0000 (21:12 -0400)]
Merge change I7df84618 into eclair
* changes:
Add a privateImeOption to represent that the IME should not show the voice input microphone, if it otherwise would, whenever the search dialog is planning on showing a voice search button (as specified by the current searchable).
Jack Wang [Sat, 31 Oct 2009 00:07:56 +0000 (17:07 -0700)]
am
e8228afb: Merge change I92cdc5ed into eclair
Merge commit '
e8228afb2bd005ae25ce58719f9d678389b26a16' into eclair-mr2
* commit '
e8228afb2bd005ae25ce58719f9d678389b26a16':
PerformanceCollector: Collect & report perf measurements in key/value form
Mathias Agopian [Sat, 31 Oct 2009 00:07:49 +0000 (17:07 -0700)]
am
77bd91f8: Merge change Ie3e80456 into eclair
Merge commit '
77bd91f8af44867935ea2df22f69fb244b009b94' into eclair-mr2
* commit '
77bd91f8af44867935ea2df22f69fb244b009b94':
Turns out the SGX driver is correct and the bug was in this test.
Brett Chabot [Sat, 31 Oct 2009 00:07:03 +0000 (17:07 -0700)]
Suppress takePicture test from continuous DO NOT MERGE.
Bug
2141755
Android (Google) Code Review [Sat, 31 Oct 2009 00:02:13 +0000 (20:02 -0400)]
Merge change I92cdc5ed into eclair
* changes:
PerformanceCollector: Collect & report perf measurements in key/value form
Brett Chabot [Fri, 30 Oct 2009 23:48:09 +0000 (16:48 -0700)]
Remove testCheckMediaPlaybackHandlesApplicationItunes from continuous.
This test causes the whole suite to hang.
Android (Google) Code Review [Fri, 30 Oct 2009 23:40:09 +0000 (19:40 -0400)]
Merge change Ie3e80456 into eclair
* changes:
Turns out the SGX driver is correct and the bug was in this test.
Mathias Agopian [Fri, 30 Oct 2009 23:32:52 +0000 (16:32 -0700)]
Turns out the SGX driver is correct and the bug was in this test.
make sure the 565 1-texel wide texture is specified with an alignment of 4
which is the OpenGL ES default.
Mike LeBeau [Fri, 30 Oct 2009 23:11:40 +0000 (16:11 -0700)]
Add a privateImeOption to represent that the IME should not show
the voice input microphone, if it otherwise would, whenever the
search dialog is planning on showing a voice search button (as
specified by the current searchable).
The IME will respect this shortly.
http://b/
2228562
Jaikumar Ganesh [Fri, 30 Oct 2009 20:56:32 +0000 (13:56 -0700)]
Add ability to disable sending Photos using Vcard. Do Not Merge
This to fix PBAP support for some car kits which are unable
to handle contacts with photos.
Original Change by: Yue Lixin
Bug:
2183320
Dr No: Eastham
Mathias Agopian [Fri, 30 Oct 2009 22:02:04 +0000 (15:02 -0700)]
am
9baef73c: Merge change Id8b28e4f into eclair
Merge commit '
9baef73c9b2ea17a4eba997c45e944ac6b9af835' into eclair-mr2
* commit '
9baef73c9b2ea17a4eba997c45e944ac6b9af835':
fix [
2225964] Android runtime restarted in surfaceflinger/BlurFilter.cpp
Mathias Agopian [Fri, 30 Oct 2009 22:01:57 +0000 (15:01 -0700)]
am
d01767f8: Merge change I56779290 into eclair
Merge commit '
d01767f8b7038108f9125cd2122b117db9919824' into eclair-mr2
* commit '
d01767f8b7038108f9125cd2122b117db9919824':
fix[
2222341] Soft reset while going back from camcorder settings
Mathias Agopian [Fri, 30 Oct 2009 22:01:44 +0000 (15:01 -0700)]
am
f989c114: Merge change If007a2fa into eclair
Merge commit '
f989c1140bbc84480498df38abec0fafff04e6ee' into eclair-mr2
* commit '
f989c1140bbc84480498df38abec0fafff04e6ee':
return proper error code from eglCreateImageKHR
Android (Google) Code Review [Fri, 30 Oct 2009 21:54:16 +0000 (17:54 -0400)]
Merge change Id8b28e4f into eclair
* changes:
fix [
2225964] Android runtime restarted in surfaceflinger/BlurFilter.cpp
Android (Google) Code Review [Fri, 30 Oct 2009 21:54:10 +0000 (17:54 -0400)]
Merge change I56779290 into eclair
* changes:
fix[
2222341] Soft reset while going back from camcorder settings
Android (Google) Code Review [Fri, 30 Oct 2009 21:54:03 +0000 (17:54 -0400)]
Merge change If007a2fa into eclair
* changes:
return proper error code from eglCreateImageKHR
Mathias Agopian [Fri, 30 Oct 2009 01:29:30 +0000 (18:29 -0700)]
fix[
2222341] Soft reset while going back from camcorder settings
add a way to convert a mapped "pushbuffer" buffer to a gralloc handle
which then can be safely used by surfaceflinger, without including
gralloc_priv.h
Mike Reed [Fri, 30 Oct 2009 21:13:44 +0000 (14:13 -0700)]
am
1864d01f: Merge change Iae849da2 into eclair
Merge commit '
1864d01f2be0e82da7d8844fa91bee8880282041' into eclair-mr2
* commit '
1864d01f2be0e82da7d8844fa91bee8880282041':
add table maskfilter
Android (Google) Code Review [Fri, 30 Oct 2009 21:03:18 +0000 (17:03 -0400)]
Merge change Iae849da2 into eclair
* changes:
add table maskfilter
Andy McFadden [Fri, 30 Oct 2009 18:03:55 +0000 (11:03 -0700)]
am
4d0bf120: (-s ours) Merge change I08c19bee into eclair
Merge commit '
4d0bf1201edd3dd8da5b9f07379336390bd234fe' into eclair-mr2
* commit '
4d0bf1201edd3dd8da5b9f07379336390bd234fe':
DO NOT MERGE: Another gcc 4.0.3 workaround.
Android (Google) Code Review [Fri, 30 Oct 2009 17:53:32 +0000 (13:53 -0400)]
Merge change I08c19bee into eclair
* changes:
DO NOT MERGE: Another gcc 4.0.3 workaround.
Jaikumar Ganesh [Fri, 30 Oct 2009 17:31:25 +0000 (10:31 -0700)]
am
3cf254d2: Merge change I4b3db907 into eclair
Merge commit '
3cf254d2ba303da3354ed65fd7f3136e87a56b9f' into eclair-mr2
* commit '
3cf254d2ba303da3354ed65fd7f3136e87a56b9f':
Revert the channge where channels were not selected randomly.
Andy McFadden [Thu, 29 Oct 2009 17:19:34 +0000 (10:19 -0700)]
DO NOT MERGE: Another gcc 4.0.3 workaround.
Temporarily make a function public that doesn't need to be. When
host gcc-4.0.3 is gone from the build servers we can undo this.
(Cherry-picked from eclair-mr2.)
Android (Google) Code Review [Fri, 30 Oct 2009 17:23:43 +0000 (13:23 -0400)]
Merge change I4b3db907 into eclair
* changes:
Revert the channge where channels were not selected randomly.
Jaikumar Ganesh [Fri, 30 Oct 2009 16:37:25 +0000 (09:37 -0700)]
Revert the channge where channels were not selected randomly.
The Bluez SDP bug has been fixed.
Reverting parts of the commit:
16fb88a673c41b93c5d57ccb28c2697e7d87701a
Bug:
2173752
Dr No: Eastham
Mike Reed [Thu, 29 Oct 2009 21:20:49 +0000 (17:20 -0400)]
add table maskfilter
hidden for now, since it need only be seen by Launcher2
http://b/issue?id=
2210685
Mathias Agopian [Fri, 30 Oct 2009 03:24:44 +0000 (20:24 -0700)]
fix [
2225964] Android runtime restarted in surfaceflinger/BlurFilter.cpp
crash was due to an unintialized variable, which caused the wrong bluring
format to be used and caused a memory overrrun.
Jeff Sharkey [Fri, 30 Oct 2009 02:35:32 +0000 (19:35 -0700)]
am
824838d7: Avoid NPE when callers send null selection args.
Merge commit '
824838d74eb0316f6987a1d98d2d9e9fa8d4e15b' into eclair-mr2
* commit '
824838d74eb0316f6987a1d98d2d9e9fa8d4e15b':
Avoid NPE when callers send null selection args.
Gloria Wang [Fri, 30 Oct 2009 02:35:16 +0000 (19:35 -0700)]
am
3a814141: Merge change Iee0486e2 into eclair
Merge commit '
3a8141416a0b1d517d4729eba4bcf914c468e20b' into eclair-mr2
* commit '
3a8141416a0b1d517d4729eba4bcf914c468e20b':
Dump media recorder PID in dumpsys media.player, and fix minor bugs.
Mathias Agopian [Fri, 30 Oct 2009 02:34:15 +0000 (19:34 -0700)]
am
5dc7a21c: Merge change I4e036287 into eclair
Merge commit '
5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a' into eclair-mr2
* commit '
5dc7a21cbbd4af908e39e55e5ca7ab14cda25d4a':
update line test to expose some bug on SGX530 ed4
Fred Quintana [Fri, 30 Oct 2009 02:33:09 +0000 (19:33 -0700)]
am
fae288c7: Merge change I9efe265f into eclair
Merge commit '
fae288c7987f96df05e91ed154e934de267098be' into eclair-mr2
* commit '
fae288c7987f96df05e91ed154e934de267098be':
unhide AccountManagerResponse
Ed Heyl [Fri, 30 Oct 2009 02:32:23 +0000 (19:32 -0700)]
am
154d61fc: Merge change Id6f158b3 into eclair
Merge commit '
154d61fc99964bc5ad13384027f063e77b36f9eb' into eclair-mr2
* commit '
154d61fc99964bc5ad13384027f063e77b36f9eb':
Removed javadoc link to hidden class (temporary fix for build)
San Mehat [Fri, 30 Oct 2009 02:32:06 +0000 (19:32 -0700)]
am
957e5867: process: Disable debugging
Merge commit '
957e58670baad8c5995f1368e3b5280f0dbd891f' into eclair-mr2
* commit '
957e58670baad8c5995f1368e3b5280f0dbd891f':
process: Disable debugging
Evan Millar [Fri, 30 Oct 2009 02:31:24 +0000 (19:31 -0700)]
am
3034624f: Merge change I26a2d829 into eclair
Merge commit '
3034624f68d373d7c79237425319b5b7fd84317e' into eclair-mr2
* commit '
3034624f68d373d7c79237425319b5b7fd84317e':
Add -P flag to ps in dumpstate
Costin Manolache [Fri, 30 Oct 2009 02:30:43 +0000 (19:30 -0700)]
am
4388b988: Merge change Idc4c7714 into eclair
Merge commit '
4388b98845e6a28c689e500cd6ed1e9bb29a2c12' into eclair-mr2
* commit '
4388b98845e6a28c689e500cd6ed1e9bb29a2c12':
Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes.
Jason Sams [Fri, 30 Oct 2009 02:30:11 +0000 (19:30 -0700)]
am
ec1f1e3d: Merge change Ieab4c75b into eclair
Merge commit '
ec1f1e3df1ca5e73e262df479bf91a92f3ccafde' into eclair-mr2
* commit '
ec1f1e3df1ca5e73e262df479bf91a92f3ccafde':
Fix type in Java enums. Not currently used, easier to fix now than when apps are using it.
Jeff Hamilton [Fri, 30 Oct 2009 02:29:16 +0000 (19:29 -0700)]
am
b5c05516: Merge change I3b7d5cbe into eclair
Merge commit '
b5c05516ba2c341655d54f17bdd17a5ab2d173df' into eclair-mr2
* commit '
b5c05516ba2c341655d54f17bdd17a5ab2d173df':
Copy the selection args when creating a CPO since callers often reuse the passed in array.
San Mehat [Fri, 30 Oct 2009 02:28:58 +0000 (19:28 -0700)]
am
8e312e81: Merge change Ia5109a87 into eclair
Merge commit '
8e312e8160ef0cae569b6127591ee72c70bfda41' into eclair-mr2
* commit '
8e312e8160ef0cae569b6127591ee72c70bfda41':
process: Add debug code to log process group transitions