OSDN Git Service
Jean-Baptiste Queru [Wed, 28 Oct 2009 20:42:51 +0000 (13:42 -0700)]
merge from open-source master
Christopher Tate [Wed, 28 Oct 2009 19:19:01 +0000 (12:19 -0700)]
am
763ccae7: Merge change I8e7f5f07 into eclair
Merge commit '
763ccae7d734cc7e55772936dc3f101a2bf453d4' into eclair-plus-aosp
* commit '
763ccae7d734cc7e55772936dc3f101a2bf453d4':
DO NOT MERGE: Fix loss of focus after wakeup into incall screen
Android (Google) Code Review [Wed, 28 Oct 2009 19:09:29 +0000 (15:09 -0400)]
Merge change I8e7f5f07 into eclair
* changes:
DO NOT MERGE: Fix loss of focus after wakeup into incall screen
Christopher Tate [Wed, 28 Oct 2009 03:23:28 +0000 (20:23 -0700)]
DO NOT MERGE: Fix loss of focus after wakeup into incall screen
Because of the asynchronous behavior of keyguard, and incall explicitly
disabling keyguard, sometimes the window manager would wind up in a state in
which the "correct" app and activity window were shown, but focus was
recalculated "too soon," at a time when keyguard was just about gone but not
quite, and incall was not yet fully shown. In this case there was no currently
valid event target, but the final show of the incall window would not prompt a
focus recalculation, so that "no current focus" state would incorrectly persist,
resulting in spurious ANRs until some other phone activity forced a focus
update.
We now detect the problematic case when windows are shown, and make sure to
recalculate focus explicitly thereafter. This change does *not* fix the
underlying race conditions that have been resulting in mismatched state within
the window manager, but it does force a validation pass that puts things in
order so that normal operation can continue.
Change-Id: I8e7f5f0795f0042a0da074aeed385e3fbc210360
Scott Main [Wed, 28 Oct 2009 18:48:01 +0000 (11:48 -0700)]
am
25aa87b2: am
d14f1bd7: Merge change Iacb6e122 into eclair-sdk
Merge commit '
25aa87b2fdd065637cc87cb4b3e58b828aa29120' into eclair-plus-aosp
* commit '
25aa87b2fdd065637cc87cb4b3e58b828aa29120':
docs: add 2.0 video to developer site feature videos
Dirk Dougherty [Wed, 28 Oct 2009 18:47:47 +0000 (11:47 -0700)]
am
340fbc36: am
5a4d6696: Merge change Ib80db923 into eclair-sdk
Merge commit '
340fbc36fb5ded7819d09d55117917b9a6361fd4' into eclair-plus-aosp
* commit '
340fbc36fb5ded7819d09d55117917b9a6361fd4':
doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
Scott Main [Wed, 28 Oct 2009 18:40:09 +0000 (11:40 -0700)]
am
d14f1bd7: Merge change Iacb6e122 into eclair-sdk
Merge commit '
d14f1bd7e4ba28489bdc472aa736aee5a587cb98' into eclair
* commit '
d14f1bd7e4ba28489bdc472aa736aee5a587cb98':
docs: add 2.0 video to developer site feature videos
Dirk Dougherty [Wed, 28 Oct 2009 18:39:55 +0000 (11:39 -0700)]
am
5a4d6696: Merge change Ib80db923 into eclair-sdk
Merge commit '
5a4d66965d3c5061d47201fcaa62c90d126e7187' into eclair
* commit '
5a4d66965d3c5061d47201fcaa62c90d126e7187':
doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
Android (Google) Code Review [Wed, 28 Oct 2009 18:27:48 +0000 (14:27 -0400)]
Merge change Iacb6e122 into eclair-sdk
* changes:
docs: add 2.0 video to developer site feature videos
Scott Main [Wed, 28 Oct 2009 18:12:58 +0000 (11:12 -0700)]
docs: add 2.0 video to developer site feature videos
Eric Fischer [Wed, 28 Oct 2009 17:24:53 +0000 (10:24 -0700)]
am
fb872d1a: Merge change Id4d04def into eclair
Merge commit '
fb872d1af3c775114ac7d241eb1924a9aafbb9df' into eclair-plus-aosp
* commit '
fb872d1af3c775114ac7d241eb1924a9aafbb9df':
Fix a race that kept the locale picker from working under heavy CPU load.
Android (Google) Code Review [Wed, 28 Oct 2009 17:18:39 +0000 (13:18 -0400)]
Merge change Id4d04def into eclair
* changes:
Fix a race that kept the locale picker from working under heavy CPU load.
Android (Google) Code Review [Wed, 28 Oct 2009 15:56:04 +0000 (11:56 -0400)]
Merge change Ib80db923 into eclair-sdk
* changes:
doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
Jean-Michel Trivi [Wed, 28 Oct 2009 15:53:31 +0000 (08:53 -0700)]
am
89889733: Merge change I4e83a76a into eclair
Merge commit '
898897338dfd62a268a89fb55ee900a9bd5a683f' into eclair-plus-aosp
* commit '
898897338dfd62a268a89fb55ee900a9bd5a683f':
Fix bug
2201417. Whenever the System setting that indicates
Android (Google) Code Review [Wed, 28 Oct 2009 15:47:54 +0000 (11:47 -0400)]
Merge change I4e83a76a into eclair
* changes:
Fix bug
2201417. Whenever the System setting that indicates whether the notifcation stream uses the ring volume changes, the table of stream volume aliases in AudioService is updated. But the name of the alias stored in VolumeStreamState.mVolumeIndexSettingName was not updated whenever the NOTIFICATIONS_USE_RING_VOLUME setting was updated. This caused the wrong volume setting to be persisted. This change ensures the setting name is updated whenever the volume alias is, and persists the notification volume change right away (instead of after a delay), so that registered observers are notified right away. The notification seekbar in the sound settings is an example of such an observer.
Jean-Baptiste Queru [Wed, 28 Oct 2009 15:31:17 +0000 (08:31 -0700)]
Merge from donut
Jean-Baptiste Queru [Wed, 28 Oct 2009 14:40:31 +0000 (07:40 -0700)]
Reconcile true history with open-source donut snapshots
Mike Lockwood [Wed, 28 Oct 2009 12:55:22 +0000 (05:55 -0700)]
am
d376d240: Merge change I081f08c1 into eclair
Merge commit '
d376d2407bbc14a2d221dfef9955d0feeab0d550' into eclair-plus-aosp
* commit '
d376d2407bbc14a2d221dfef9955d0feeab0d550':
A better solution for ignoring user activity while the screen is animating off.
Android (Google) Code Review [Wed, 28 Oct 2009 12:46:06 +0000 (08:46 -0400)]
Merge change I081f08c1 into eclair
* changes:
A better solution for ignoring user activity while the screen is animating off.
Mathias Agopian [Wed, 28 Oct 2009 09:16:14 +0000 (02:16 -0700)]
am
7bde36e6: added GL test for textured lines
Merge commit '
7bde36e64e66c81f0150d0372e1357a31f4ec704' into eclair-plus-aosp
* commit '
7bde36e64e66c81f0150d0372e1357a31f4ec704':
added GL test for textured lines
Mathias Agopian [Wed, 28 Oct 2009 09:09:21 +0000 (02:09 -0700)]
added GL test for textured lines
Mathias Agopian [Wed, 28 Oct 2009 06:48:38 +0000 (23:48 -0700)]
am
73e17015: Merge change I8d2de438 into eclair
Merge commit '
73e17015d3cd67c93ccad5d63d31c439ff6fa694' into eclair-plus-aosp
* commit '
73e17015d3cd67c93ccad5d63d31c439ff6fa694':
fix [
2143798] Need to figure out how to do video
Android (Google) Code Review [Wed, 28 Oct 2009 06:42:12 +0000 (02:42 -0400)]
Merge change I8d2de438 into eclair
* changes:
fix [
2143798] Need to figure out how to do video
Mike Lockwood [Wed, 28 Oct 2009 03:07:25 +0000 (23:07 -0400)]
A better solution for ignoring user activity while the screen is animating off.
Fixes a deadlock that occurred because mAnimatingScreenOff was left set to true
after aborting turning off the screen.
This change removes the mAnimatingScreenOff flag and checks for
(mScreenBrightness.animating && mScreenBrightness.targetValue == 0) instead.
Fixes bug b/
2219706
Change-Id: I081f08c14ad7585a953fb567867238b1f3db841f
Signed-off-by: Mike Lockwood <lockwood@android.com>
Dirk Dougherty [Wed, 28 Oct 2009 01:02:29 +0000 (18:02 -0700)]
doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
Bug:
2160782
Change-Id: Ib80db9231f91a36f503db487982378b252c0fcd8
Eric Fischer [Wed, 28 Oct 2009 01:55:57 +0000 (18:55 -0700)]
Fix a race that kept the locale picker from working under heavy CPU load.
The locale picker and the activity transition would both change the
configuration, and depending upon the timing, the activity transition
would undo what the locale picker had just done. Usually it worked right,
but would often fail if the user changed locales just after a data wipe,
when the media scanner was working hard in the background to index
the contents of the SD card.
http://b/issue?id=
2216298
Jean-Michel Trivi [Wed, 28 Oct 2009 00:39:30 +0000 (17:39 -0700)]
Fix bug
2201417. Whenever the System setting that indicates
whether the notifcation stream uses the ring volume changes, the
table of stream volume aliases in AudioService is updated. But the
name of the alias stored in VolumeStreamState.mVolumeIndexSettingName
was not updated whenever the NOTIFICATIONS_USE_RING_VOLUME setting
was updated. This caused the wrong volume setting to be persisted.
This change ensures the setting name is updated whenever the volume
alias is, and persists the notification volume change right away
(instead of after a delay), so that registered observers are notified
right away. The notification seekbar in the sound settings is an
example of such an observer.
Dave Sparks [Wed, 28 Oct 2009 00:47:45 +0000 (17:47 -0700)]
am
8321bdf4: Merge change I95529db1 into eclair
Merge commit '
8321bdf4dd85b81224d84b0d7a2f53218bf1a250' into eclair-plus-aosp
* commit '
8321bdf4dd85b81224d84b0d7a2f53218bf1a250':
Add Free Flight ringtone to source tree.
Android (Google) Code Review [Wed, 28 Oct 2009 00:36:13 +0000 (20:36 -0400)]
Merge change I95529db1 into eclair
* changes:
Add Free Flight ringtone to source tree.
Scott Main [Wed, 28 Oct 2009 00:35:23 +0000 (17:35 -0700)]
am
42522449: am
675eb31d: Merge change I1a010c12 into eclair-sdk
Merge commit '
4252244939089ce0b055456335071bb7f2c0d1c3' into eclair-plus-aosp
* commit '
4252244939089ce0b055456335071bb7f2c0d1c3':
docs: fix broken link for download page.
Dave Sparks [Wed, 28 Oct 2009 00:31:52 +0000 (17:31 -0700)]
Add Free Flight ringtone to source tree.
Scott Main [Wed, 28 Oct 2009 00:27:13 +0000 (17:27 -0700)]
am
675eb31d: Merge change I1a010c12 into eclair-sdk
Merge commit '
675eb31d8d3f349de3d4f8db11631aee0118d85d' into eclair
* commit '
675eb31d8d3f349de3d4f8db11631aee0118d85d':
docs: fix broken link for download page.
Android (Google) Code Review [Wed, 28 Oct 2009 00:16:58 +0000 (20:16 -0400)]
Merge change I1a010c12 into eclair-sdk
* changes:
docs: fix broken link for download page.
Scott Main [Wed, 28 Oct 2009 00:02:12 +0000 (17:02 -0700)]
docs: fix broken link for download page.
a script was inserting a path that is no longer needed.
the removed class was the script identifier, so removing
this class means the path won't be added.
Ying Wang [Tue, 27 Oct 2009 23:08:58 +0000 (16:08 -0700)]
am
d85c4b34: Merge change Idb328ab7 into eclair
Merge commit '
d85c4b346fe8e335a979b8bbfd2767eae91aca35' into eclair-plus-aosp
* commit '
d85c4b346fe8e335a979b8bbfd2767eae91aca35':
Explicitly specify that online-sdk depends on framework-res.
Android (Google) Code Review [Tue, 27 Oct 2009 23:02:47 +0000 (19:02 -0400)]
Merge change Idb328ab7 into eclair
* changes:
Explicitly specify that online-sdk depends on framework-res.
Guang Zhu [Tue, 27 Oct 2009 22:54:55 +0000 (15:54 -0700)]
am
aebcaec3: Merge change I2e90d640 into eclair
Merge commit '
aebcaec3c171f636a24051ce85ded2f86b09461b' into eclair-plus-aosp
* commit '
aebcaec3c171f636a24051ce85ded2f86b09461b':
Remove the activity restart between urls.
Jason Sams [Tue, 27 Oct 2009 22:51:12 +0000 (15:51 -0700)]
am
e9e50b57: Merge change I7136220b into eclair
Merge commit '
e9e50b57e03cfea2d0b9b540e5a2baa36e2d60e8' into eclair-plus-aosp
* commit '
e9e50b57e03cfea2d0b9b540e5a2baa36e2d60e8':
Fix egl cleanup code on context teardown.
Android (Google) Code Review [Tue, 27 Oct 2009 22:44:56 +0000 (18:44 -0400)]
Merge change I2e90d640 into eclair
* changes:
Remove the activity restart between urls.
Android (Google) Code Review [Tue, 27 Oct 2009 22:37:48 +0000 (18:37 -0400)]
Merge change I7136220b into eclair
* changes:
Fix egl cleanup code on context teardown.
Guang Zhu [Tue, 27 Oct 2009 22:21:51 +0000 (15:21 -0700)]
Remove the activity restart between urls.
Jason Sams [Tue, 27 Oct 2009 21:44:31 +0000 (14:44 -0700)]
Fix egl cleanup code on context teardown.
Mike Lockwood [Tue, 27 Oct 2009 20:53:46 +0000 (13:53 -0700)]
am
5ef89808: Merge change I9c242127 into eclair
Merge commit '
5ef898080c1b8b596531c938eae87b3c35331ac2' into eclair-plus-aosp
* commit '
5ef898080c1b8b596531c938eae87b3c35331ac2':
PowerManagerService: Animate LCD backlight changes due to autobrightness support.
Dave Sparks [Tue, 27 Oct 2009 20:50:11 +0000 (13:50 -0700)]
am
98de26e0: Merge change I8cc42c52 into eclair
Merge commit '
98de26e06aeab9d3e6abd92080eec9ad54f537b6' into eclair-plus-aosp
* commit '
98de26e06aeab9d3e6abd92080eec9ad54f537b6':
Add some logging to detect if AsyncPlayer is lagging. Bug
2201082.
Android (Google) Code Review [Tue, 27 Oct 2009 20:43:28 +0000 (16:43 -0400)]
Merge change I9c242127 into eclair
* changes:
PowerManagerService: Animate LCD backlight changes due to autobrightness support.
Android (Google) Code Review [Tue, 27 Oct 2009 20:34:37 +0000 (16:34 -0400)]
Merge change I8cc42c52 into eclair
* changes:
Add some logging to detect if AsyncPlayer is lagging. Bug
2201082.
Dave Sparks [Tue, 27 Oct 2009 15:27:45 +0000 (08:27 -0700)]
Add some logging to detect if AsyncPlayer is lagging. Bug
2201082.
Mathias Agopian [Tue, 27 Oct 2009 03:12:37 +0000 (20:12 -0700)]
fix [
2143798] Need to figure out how to do video
Use EGLImageKHR instead of copybit directly.
We now have the basis to use streaming YUV textures (well, in fact
we already are). When/if we use the GPU instead of the MDP we'll
need to make sure it supports the appropriate YUV format.
Also make sure we compile if EGL_ANDROID_image_native_buffer is not supported
Mike Reed [Tue, 27 Oct 2009 20:00:23 +0000 (13:00 -0700)]
am
2dfaa698: Merge change I882d2eb8 into eclair
Merge commit '
2dfaa698012b36d83e342b5ef1e88734dfbcac80' into eclair-plus-aosp
* commit '
2dfaa698012b36d83e342b5ef1e88734dfbcac80':
do not merge
Dianne Hackborn [Tue, 27 Oct 2009 20:00:07 +0000 (13:00 -0700)]
am
1f668fff: Merge change Idb13ed9a into eclair
Merge commit '
1f668fff8ad2b8d79d42da5d9667d308fa0b9441' into eclair-plus-aosp
* commit '
1f668fff8ad2b8d79d42da5d9667d308fa0b9441':
Add SDK version for MR1.
Android (Google) Code Review [Tue, 27 Oct 2009 19:50:10 +0000 (15:50 -0400)]
Merge change I882d2eb8 into eclair
* changes:
do not merge
Android (Google) Code Review [Tue, 27 Oct 2009 19:47:57 +0000 (15:47 -0400)]
Merge change Idb13ed9a into eclair
* changes:
Add SDK version for MR1.
Mike Lockwood [Tue, 27 Oct 2009 19:47:02 +0000 (15:47 -0400)]
PowerManagerService: Animate LCD backlight changes due to autobrightness support.
Change-Id: I9c242127df801125c30f399198d1f7e9c8579612
Signed-off-by: Mike Lockwood <lockwood@android.com>
Amith Yamasani [Tue, 27 Oct 2009 19:05:15 +0000 (12:05 -0700)]
Amith Yamasani [Tue, 27 Oct 2009 19:04:56 +0000 (12:04 -0700)]
am
aea1b3b2: Disambiguation between multiple pointers and swipe gestures.
Merge commit '
aea1b3b24ee895c24ed25c5706bc2f390b41689d' into eclair-plus-aosp
* commit '
aea1b3b24ee895c24ed25c5706bc2f390b41689d':
Disambiguation between multiple pointers and swipe gestures.
Wink Saville [Tue, 27 Oct 2009 19:04:29 +0000 (12:04 -0700)]
am
a2058e43: Merge change I11c3cdc7 into eclair
Merge commit '
a2058e431736810503bc85fadec31a8e0bfcad95' into eclair-plus-aosp
* commit '
a2058e431736810503bc85fadec31a8e0bfcad95':
Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.
Amith Yamasani [Tue, 27 Oct 2009 18:45:08 +0000 (11:45 -0700)]
Fix build.
Ying Wang [Tue, 27 Oct 2009 18:00:30 +0000 (11:00 -0700)]
Explicitly specify that online-sdk depends on framework-res.
Amith Yamasani [Wed, 21 Oct 2009 23:53:31 +0000 (16:53 -0700)]
Disambiguation between multiple pointers and swipe gestures.
Sometimes quickly touching the screen with two fingers will result
in the firmware thinking one finger moved very quickly. This code
tries to identify the difference between the two based on velocity
of the last N points versus the velocity of the last M points and
figure out if there was mostly acceleration or a sudden deceleration.
It's still not perfect and very dependent on the touch hardware.
Android (Google) Code Review [Tue, 27 Oct 2009 17:02:43 +0000 (13:02 -0400)]
Merge change I11c3cdc7 into eclair
* changes:
Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.
Mike Lockwood [Tue, 27 Oct 2009 14:12:09 +0000 (07:12 -0700)]
am
2d155d26: PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
Merge commit '
2d155d264e5cefc27abf2c5020fcfa06bde755ec' into eclair-plus-aosp
* commit '
2d155d264e5cefc27abf2c5020fcfa06bde755ec':
PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
Mike Lockwood [Tue, 27 Oct 2009 13:32:30 +0000 (09:32 -0400)]
PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
Fixes bugs b/
2216879 and b/
2197060
Change-Id: I5de3cbdbc0601dd7950dba74cacfff06d41ad18e
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Reed [Tue, 27 Oct 2009 12:25:02 +0000 (08:25 -0400)]
do not merge
remove the filter when we're scrolling, so we don't degrade the quality
http://b/issue?id=
2174463&cookieId=
2009300052135424
same change (in spirit) in MR2
https://android-git.corp.google.com/g/#change,30860
Mike Lockwood [Tue, 27 Oct 2009 12:10:48 +0000 (05:10 -0700)]
am
8061f64f: Merge change Ib0d3d9d0 into eclair
Merge commit '
8061f64f6246116381131fc7951b6d88be37161a' into eclair-plus-aosp
* commit '
8061f64f6246116381131fc7951b6d88be37161a':
PowerManagerService: Clear Binder calling identity around calls to Sensor Manager.
Android (Google) Code Review [Tue, 27 Oct 2009 12:01:38 +0000 (08:01 -0400)]
Merge change Ib0d3d9d0 into eclair
* changes:
PowerManagerService: Clear Binder calling identity around calls to Sensor Manager.
Mike Lockwood [Tue, 27 Oct 2009 02:10:33 +0000 (22:10 -0400)]
PowerManagerService: Clear Binder calling identity around calls to Sensor Manager.
This fixes a problem that resulted in bogus battery statistics for the prox and light sensors
due to the sensors being enabled in an app's context and disabled in the system context.
Fixes problems reported in bug b/
2211960
Change-Id: Ib0d3d9d06f043b386d3b8d494b9bad5bd40bb6e1
Signed-off-by: Mike Lockwood <lockwood@android.com>
Dirk Dougherty [Tue, 27 Oct 2009 01:42:44 +0000 (18:42 -0700)]
am
59625fa8: am
946f9d1e: Merge change I020b31e1 into eclair-sdk
Merge commit '
59625fa86ad0e520931361aba120e2d868f01618' into eclair-plus-aosp
* commit '
59625fa86ad0e520931361aba120e2d868f01618':
doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
Scott Main [Tue, 27 Oct 2009 01:42:15 +0000 (18:42 -0700)]
am
91bfbfb9: am
08c57535: docs: add 2.0 highlights doc and updated homepage
Merge commit '
91bfbfb9e571cd2ee79e69d5fb1d0d2b368223c4' into eclair-plus-aosp
* commit '
91bfbfb9e571cd2ee79e69d5fb1d0d2b368223c4':
docs: add 2.0 highlights doc and updated homepage
Dirk Dougherty [Tue, 27 Oct 2009 01:41:14 +0000 (18:41 -0700)]
am
37ebfad1: am
a250f0c8: doc change: fix broken link at top of installing doc
Merge commit '
37ebfad1619f250bda4803dfb8683f408d9482cb' into eclair-plus-aosp
* commit '
37ebfad1619f250bda4803dfb8683f408d9482cb':
doc change: fix broken link at top of installing doc
Dirk Dougherty [Tue, 27 Oct 2009 01:31:20 +0000 (18:31 -0700)]
am
946f9d1e: Merge change I020b31e1 into eclair-sdk
Merge commit '
946f9d1edc25346f42e30e94e1553bcadea2acf5' into eclair
* commit '
946f9d1edc25346f42e30e94e1553bcadea2acf5':
doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
Scott Main [Tue, 27 Oct 2009 01:31:04 +0000 (18:31 -0700)]
am
08c57535: docs: add 2.0 highlights doc and updated homepage
Merge commit '
08c57535d180469bf902e75fc90c9f87c5ceb9a7' into eclair
* commit '
08c57535d180469bf902e75fc90c9f87c5ceb9a7':
docs: add 2.0 highlights doc and updated homepage
Dirk Dougherty [Tue, 27 Oct 2009 01:30:30 +0000 (18:30 -0700)]
am
a250f0c8: doc change: fix broken link at top of installing doc
Merge commit '
a250f0c808ff01f7a5c9fe393ef2bdf4266a7d9f' into eclair
* commit '
a250f0c808ff01f7a5c9fe393ef2bdf4266a7d9f':
doc change: fix broken link at top of installing doc
Android (Google) Code Review [Tue, 27 Oct 2009 01:24:44 +0000 (21:24 -0400)]
Merge change I020b31e1 into eclair-sdk
* changes:
doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
Dirk Dougherty [Sat, 24 Oct 2009 02:17:12 +0000 (19:17 -0700)]
doc change: add SDK sizes, checksums, small changes for online SDK doc set, add layoutopt doc.
Bug:
2160782
Change-Id: I020b31e10f2733223aa37d03687cf8a63843afa7
Yu Shan Emily Lau [Tue, 27 Oct 2009 01:17:27 +0000 (18:17 -0700)]
am
adf4b4f5: Merge change I96458368 into eclair
Merge commit '
adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd' into eclair-plus-aosp
* commit '
adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd':
Fixed the H263 video duation which caused the incorrect video validation.
Android (Google) Code Review [Tue, 27 Oct 2009 01:10:48 +0000 (21:10 -0400)]
Merge change I96458368 into eclair
* changes:
Fixed the H263 video duation which caused the incorrect video validation.
Dave Sparks [Tue, 27 Oct 2009 01:07:10 +0000 (18:07 -0700)]
am
e8543418: Merge change I7c0d20a7 into eclair
Merge commit '
e8543418783f8f8f9a6bafdaa1dd6289661eac85' into eclair-plus-aosp
* commit '
e8543418783f8f8f9a6bafdaa1dd6289661eac85':
Run the metadataretriever at background priority. Bug
2187133.
Brett Chabot [Tue, 27 Oct 2009 01:06:48 +0000 (18:06 -0700)]
am
b81df8e3: Merge change I5535bbdf into eclair
Merge commit '
b81df8e3a2f72546508fcdf92adc39cfa2985c56' into eclair-plus-aosp
* commit '
b81df8e3a2f72546508fcdf92adc39cfa2985c56':
Disable flaky and failing tests.
Andreas Huber [Tue, 27 Oct 2009 01:06:29 +0000 (18:06 -0700)]
am
54620b1a: Merge change I6e50a8c6 into eclair
Merge commit '
54620b1a77e51b3fa531dbd099bd69c39d7d0029' into eclair-plus-aosp
* commit '
54620b1a77e51b3fa531dbd099bd69c39d7d0029':
Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
Yu Shan Emily Lau [Tue, 27 Oct 2009 00:58:52 +0000 (17:58 -0700)]
Fixed the H263 video duation which caused the incorrect video validation.
Android (Google) Code Review [Tue, 27 Oct 2009 01:00:46 +0000 (21:00 -0400)]
Merge change I7c0d20a7 into eclair
* changes:
Run the metadataretriever at background priority. Bug
2187133.
Android (Google) Code Review [Tue, 27 Oct 2009 00:59:29 +0000 (20:59 -0400)]
Merge change I5535bbdf into eclair
* changes:
Disable flaky and failing tests.
Brett Chabot [Tue, 27 Oct 2009 00:44:38 +0000 (17:44 -0700)]
Disable flaky and failing tests.
Bugs
2118268,
2176089
Dianne Hackborn [Fri, 23 Oct 2009 19:32:45 +0000 (12:32 -0700)]
Add SDK version for MR1.
Change-Id: Idb13ed9a35397effbfb72a934a7db5f5a882c79c
Scott Main [Thu, 22 Oct 2009 21:57:09 +0000 (14:57 -0700)]
docs: add 2.0 highlights doc and updated homepage
Dave Sparks [Mon, 26 Oct 2009 23:28:26 +0000 (16:28 -0700)]
Run the metadataretriever at background priority. Bug
2187133.
This change forces metadata retreiver threads to background priority.
Uses an inner class to encapsulate the priority change so that it
automatically restores priority when returning to the client.
Wink Saville [Mon, 26 Oct 2009 22:59:50 +0000 (15:59 -0700)]
Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.
This is the simple fix for bug
2199271 which increases the timeout
for DEACTIVATE thus allowing more time to complete before SETUP_DATA_CALL
is retried. This should fix some occurrences of this bug as the current
time is known to be too short.
Bug:
2199271
Change-Id: I11c3cdc74678399de5f812133c83d687d0ed9937
Android (Google) Code Review [Mon, 26 Oct 2009 22:41:19 +0000 (18:41 -0400)]
Merge change I6e50a8c6 into eclair
* changes:
Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
Jaikumar Ganesh [Mon, 26 Oct 2009 22:23:37 +0000 (15:23 -0700)]
am
6158038a: Merge change I2811f162 into eclair
Merge commit '
6158038a09069bc178970160d4b3667573bfc655' into eclair-plus-aosp
* commit '
6158038a09069bc178970160d4b3667573bfc655':
Add Authentication Type field to the APN settings.
Android (Google) Code Review [Mon, 26 Oct 2009 22:14:15 +0000 (18:14 -0400)]
Merge change I2811f162 into eclair
* changes:
Add Authentication Type field to the APN settings.
Jean-Baptiste Queru [Mon, 26 Oct 2009 21:49:33 +0000 (14:49 -0700)]
merge from open-source master
Mike Lockwood [Mon, 26 Oct 2009 20:32:06 +0000 (13:32 -0700)]
am
86328a99: LocationManagerService: clear calling identity in mock provider calls.
Merge commit '
86328a99bd55532e318441d48ee9eb96cdc42403' into eclair-plus-aosp
* commit '
86328a99bd55532e318441d48ee9eb96cdc42403':
LocationManagerService: clear calling identity in mock provider calls.
Mike Lockwood [Fri, 23 Oct 2009 12:38:25 +0000 (08:38 -0400)]
LocationManagerService: clear calling identity in mock provider calls.
Fixes bug b/
2198028 (testDirectionsFromScratchByTyping fails because of android.permission.ACCESS_WIFI_STATE)
Change-Id: I44e95981d805189ed6d906d388c5189ee788802f
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jaikumar Ganesh [Mon, 26 Oct 2009 20:11:55 +0000 (13:11 -0700)]
Add Authentication Type field to the APN settings.
Use auth type to setup data connection.
This value defaults to -1 (unset) to maintain compatibility.
When the value is -1, the auth type gets set to 0 (if no user is specified)
or 3.
Bug: 181700
Mike Lockwood [Mon, 26 Oct 2009 19:39:52 +0000 (12:39 -0700)]
am
3333fa4f: PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit '
3333fa4f3d2e1bd3842fe7d41d19557ff9a98372' into eclair-plus-aosp
* commit '
3333fa4f3d2e1bd3842fe7d41d19557ff9a98372':
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Mike Lockwood [Mon, 26 Oct 2009 18:50:42 +0000 (14:50 -0400)]
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Change-Id: I42d2d1331c2a6234dfbdaa99f0cc8ab249f7ce22
Signed-off-by: Mike Lockwood <lockwood@android.com>
Andreas Huber [Mon, 26 Oct 2009 18:11:02 +0000 (11:11 -0700)]
Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
This reverts commit
7a03b074a554ba3fd08dbc20cfd4b2f37c5f3aaa.
Eric Laurent [Mon, 26 Oct 2009 17:58:06 +0000 (10:58 -0700)]
am
a47d1536: do not merge - Fix for issue
2184627 cherry picked from eclair-mr2
Merge commit '
a47d153647d8750b667942ad80e7b905ea98c68b' into eclair-plus-aosp
* commit '
a47d153647d8750b667942ad80e7b905ea98c68b':
do not merge - Fix for issue
2184627 cherry picked from eclair-mr2
Eric Laurent [Fri, 16 Oct 2009 16:16:26 +0000 (09:16 -0700)]
do not merge - Fix for issue
2184627 cherry picked from eclair-mr2
Bluetooth A2DP suspend-resume improvements.
This change will reduce the occurence rate of A2DP sink suspend resume failures observed in issues
2184627,
2181005 and possibly
2189628.
More robust suspend/resume logic.
Use only the suspend request to audio hardware to avoid having two concurent suspend resume control paths.
Mike Lockwood [Sun, 25 Oct 2009 16:07:25 +0000 (09:07 -0700)]
am
6897e36b: Add comment warning to not use hardware based autobrightness support.
Merge commit '
6897e36b894b2a10fd8b2e3af6587b5f789fde72' into eclair-plus-aosp
* commit '
6897e36b894b2a10fd8b2e3af6587b5f789fde72':
Add comment warning to not use hardware based autobrightness support.