15174 Commits

Author SHA1 Message Date
Dan Egnor
d9a3006649 am 13ea1204: am 596de923: am 9854deae: (-s ours) Merge change I1691f3d3 into eclair
Merge commit '13ea12044d03f3e5b2f98eddd442afe5acf69485'

* commit '13ea12044d03f3e5b2f98eddd442afe5acf69485':
  Add CPUFREQ_STATS event tag
2009-11-23 12:17:08 -08:00
Mike Lockwood
fb73f79340 Add window manager support for overriding button and keyboard backlight values.
The new backlightBrightness field works similarly as the existing WindowManager.LayoutParams.screenBrightness field

Needed for bugs:
    b/2233655 (under low ambient light the touch keys remain illuminated during video playback and never timeout)
    b/2221079 (Backlight for home/search/back/etc buttons should turn off when in dock in night mode)

Change-Id: I60dfecdc7bb653b0db38094464de651220b3d438
2009-11-23 15:16:55 -05:00
Grace Kloba
f40abf427e am ed1624d8: Merge change I8ae1b41a into eclair-mr2
Merge commit 'ed1624d8ffa4b7ade511f68d5d985e013df4e03b' into eclair-mr2-plus-aosp

* commit 'ed1624d8ffa4b7ade511f68d5d985e013df4e03b':
  Expose some debugging tools of the WebView.
2009-11-23 12:12:52 -08:00
Dan Egnor
13ea12044d am 596de923: am 9854deae: (-s ours) Merge change I1691f3d3 into eclair
Merge commit '596de923b23744e693967e1f3a644bb60c3ab30b' into eclair-mr2-plus-aosp

* commit '596de923b23744e693967e1f3a644bb60c3ab30b':
  Add CPUFREQ_STATS event tag
2009-11-23 12:12:28 -08:00
Android (Google) Code Review
ed1624d8ff Merge change I8ae1b41a into eclair-mr2
* changes:
  Expose some debugging tools of the WebView.
2009-11-23 12:07:20 -08:00
Dan Egnor
596de923b2 am 9854deae: (-s ours) Merge change I1691f3d3 into eclair
Merge commit '9854deae10aaf39999a95e440ee3dec939d47179' into eclair-mr2

* commit '9854deae10aaf39999a95e440ee3dec939d47179':
  Add CPUFREQ_STATS event tag
2009-11-23 12:03:47 -08:00
Android (Google) Code Review
9854deae10 Merge change I1691f3d3 into eclair
* changes:
  Add CPUFREQ_STATS event tag DO NOT MERGE
2009-11-23 11:57:08 -08:00
Eric Laurent
4883146af4 am 6ed9c32c: am 132dab8f: am a0f9a4f7: Merge change I2083b297 into eclair
Merge commit '6ed9c32c04d7f57bf66835c481a17b254762cea3'

* commit '6ed9c32c04d7f57bf66835c481a17b254762cea3':
  Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.
2009-11-23 11:25:58 -08:00
Eric Laurent
6ed9c32c04 am 132dab8f: am a0f9a4f7: Merge change I2083b297 into eclair
Merge commit '132dab8f91f5e87581660069753f238ea9914732' into eclair-mr2-plus-aosp

* commit '132dab8f91f5e87581660069753f238ea9914732':
  Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.
2009-11-23 11:21:01 -08:00
Eric Laurent
132dab8f91 am a0f9a4f7: Merge change I2083b297 into eclair
Merge commit 'a0f9a4f73579c2afa4dd82499a69abce94a3f23f' into eclair-mr2

* commit 'a0f9a4f73579c2afa4dd82499a69abce94a3f23f':
  Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.
2009-11-23 11:16:27 -08:00
Dianne Hackborn
9d211f7bf7 am 1f0a0ed5: am 41039247: am 8abd5f0d: Fix issue #2267665 IME keyboard appears as Blank in compose view...
Merge commit '1f0a0ed549f79c4ad6d783c93319d6807ab88847'

* commit '1f0a0ed549f79c4ad6d783c93319d6807ab88847':
  Fix issue #2267665 IME keyboard appears as Blank in compose view...
2009-11-23 11:15:56 -08:00
Dianne Hackborn
1f0a0ed549 am 41039247: am 8abd5f0d: Fix issue #2267665 IME keyboard appears as Blank in compose view...
Merge commit '4103924742c376716ce5866f6d2f53eac4f3cb59' into eclair-mr2-plus-aosp

* commit '4103924742c376716ce5866f6d2f53eac4f3cb59':
  Fix issue #2267665 IME keyboard appears as Blank in compose view...
2009-11-23 11:12:04 -08:00
Android (Google) Code Review
a0f9a4f735 Merge change I2083b297 into eclair
* changes:
  Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.
2009-11-23 11:11:55 -08:00
Dianne Hackborn
4103924742 am 8abd5f0d: Fix issue #2267665 IME keyboard appears as Blank in compose view...
Merge commit '8abd5f0d519afa787e7c64e429df17ccc661ce75' into eclair-mr2

* commit '8abd5f0d519afa787e7c64e429df17ccc661ce75':
  Fix issue #2267665 IME keyboard appears as Blank in compose view...
2009-11-23 11:05:54 -08:00
Dianne Hackborn
8abd5f0d51 Fix issue #2267665 IME keyboard appears as Blank in compose view...
...if you re-lunch messaging application after deleting the
character and pressing home key

Change-Id: Idc7da05e54730958644e80069764237e5db6f288
2009-11-23 10:58:56 -08:00
Andreas Huber
e21fb34387 am 5493df91: am bbd6cb46: Merge change Ib1b7bce4 into eclair-mr2
Merge commit '5493df919b01952857eb3b78fad3fe2cff573935'

* commit '5493df919b01952857eb3b78fad3fe2cff573935':
  Squashed commit of the following:
2009-11-23 10:55:40 -08:00
Andreas Huber
5493df919b am bbd6cb46: Merge change Ib1b7bce4 into eclair-mr2
Merge commit 'bbd6cb463b405fc90912dee470fe6c7b8c6b1f54' into eclair-mr2-plus-aosp

* commit 'bbd6cb463b405fc90912dee470fe6c7b8c6b1f54':
  Squashed commit of the following:
2009-11-23 10:51:41 -08:00
Mike Lockwood
4f4915f23f am 1866591c: am 34c5813e: am 174b7269: Merge change Id886fb28 into eclair
Merge commit '1866591c192a434c3edcafb808e31b8262cadeb2'

* commit '1866591c192a434c3edcafb808e31b8262cadeb2':
  Fix deadlock in WindowManagerService.reenableKeyguard()
2009-11-23 10:51:25 -08:00
Android (Google) Code Review
bbd6cb463b Merge change Ib1b7bce4 into eclair-mr2
* changes:
  Squashed commit of the following:
2009-11-23 10:46:25 -08:00
Mike Lockwood
1866591c19 am 34c5813e: am 174b7269: Merge change Id886fb28 into eclair
Merge commit '34c5813e488fd4f044e545f177a20f553580ce6a' into eclair-mr2-plus-aosp

* commit '34c5813e488fd4f044e545f177a20f553580ce6a':
  Fix deadlock in WindowManagerService.reenableKeyguard()
2009-11-23 10:45:24 -08:00
Andreas Huber
27366fc954 Squashed commit of the following:
commit 1efc38dc3c33fef57b759002db3965ed07a28cb0
Author: Andreas Huber <andih@google.com>
Date:   Thu Nov 19 14:36:14 2009 -0800

    Sending the SEEK-COMPLETE notification temporarily broke seeking backwards in time behaviour. This is now fixed.

    Also, get rid of the semi-random delay after posting buffers to surface flinger in favour of delaying the buffer release until the next frame is displayed.

commit 51973062eb5ee63fd64b845d72bac517cc3369cf
Author: Andreas Huber <andih@google.com>
Date:   Wed Nov 18 14:01:43 2009 -0800

    Fix one more unit test, properly send seek-complete notification only after seek actually completed.

commit cb22250b34b1fcfe1bf459723a761fd003950229
Author: Andreas Huber <andih@google.com>
Date:   Wed Nov 18 12:31:36 2009 -0800

    Fix seek-while-paused in AwesomePlayer, revert to using FileSource if MmapSource fails.

commit 25eb9241138ddf7bb27ce90657116c5f8a94d880
Author: Andreas Huber <andih@google.com>
Date:   Wed Nov 18 12:30:40 2009 -0800

    Support seeking and duration in AMRExtractor, assuming all frames are the same size.

commit 44192f2ebb7ea3bbd3ba5910025692dbc6a08faa
Author: Andreas Huber <andih@google.com>
Date:   Wed Nov 18 10:21:44 2009 -0800

    MediaPlayerImpl is dead, long live AwesomePlayer.

commit c5b52d3c0674f5dc94db506afbce52401cceddac
Author: Andreas Huber <andih@google.com>
Date:   Wed Nov 18 09:42:23 2009 -0800

    New implementation of the stagefright mediaplayer.
2009-11-23 10:44:30 -08:00
Mike Lockwood
34c5813e48 am 174b7269: Merge change Id886fb28 into eclair
Merge commit '174b726917c12d61f9135a180afc8413d845dc2d' into eclair-mr2

* commit '174b726917c12d61f9135a180afc8413d845dc2d':
  Fix deadlock in WindowManagerService.reenableKeyguard()
2009-11-23 10:40:13 -08:00
Android (Google) Code Review
174b726917 Merge change Id886fb28 into eclair
* changes:
  Fix deadlock in WindowManagerService.reenableKeyguard()
2009-11-23 10:36:32 -08:00
Grace Kloba
8ae1b41a43 Expose some debugging tools of the WebView. 2009-11-23 10:35:34 -08:00
Dan Egnor
628c258e7e am d0a1101f: am cd979d55: Merge change I494a1dc5 into eclair-mr2
Merge commit 'd0a1101f1df69bcaee81ad4d4fcf9509257e738c'

* commit 'd0a1101f1df69bcaee81ad4d4fcf9509257e738c':
  Add OperationScheduler (and test) to the common static library;
2009-11-23 10:21:26 -08:00
Dan Egnor
d0a1101f1d am cd979d55: Merge change I494a1dc5 into eclair-mr2
Merge commit 'cd979d555fbf991bdc59b3521281786e78e809fc' into eclair-mr2-plus-aosp

* commit 'cd979d555fbf991bdc59b3521281786e78e809fc':
  Add OperationScheduler (and test) to the common static library;
2009-11-23 10:15:34 -08:00
Android (Google) Code Review
cd979d555f Merge change I494a1dc5 into eclair-mr2
* changes:
  Add OperationScheduler (and test) to the common static library; includes new string parsing function (and test).
2009-11-23 10:10:51 -08:00
Daniel Sandler
4063b4d1cf am 0182aa35: am 40c1dbf0: am a59a01ab: Merge change I43f72dd1 into eclair
Merge commit '0182aa354f996ce43362cd7d1a04012ea9269f41'

* commit '0182aa354f996ce43362cd7d1a04012ea9269f41':
  Don't block TIME_TICK broadcasts in the DigitalClock widget.
2009-11-23 08:55:21 -08:00
Daniel Sandler
0182aa354f am 40c1dbf0: am a59a01ab: Merge change I43f72dd1 into eclair
Merge commit '40c1dbf081035f878b96dd67ef112eb49001c087' into eclair-mr2-plus-aosp

* commit '40c1dbf081035f878b96dd67ef112eb49001c087':
  Don't block TIME_TICK broadcasts in the DigitalClock widget.
2009-11-23 08:50:12 -08:00
Daniel Sandler
40c1dbf081 am a59a01ab: Merge change I43f72dd1 into eclair
Merge commit 'a59a01ab2b959a8a5aeb09dd664d5be193fd8219' into eclair-mr2

* commit 'a59a01ab2b959a8a5aeb09dd664d5be193fd8219':
  Don't block TIME_TICK broadcasts in the DigitalClock widget.
2009-11-23 08:44:27 -08:00
Android (Google) Code Review
a59a01ab2b Merge change I43f72dd1 into eclair
* changes:
  Don't block TIME_TICK broadcasts in the DigitalClock widget.
2009-11-23 08:39:24 -08:00
Jaikumar Ganesh
4f4fdf6dc3 am 09e27c4a: am 8631e554: am ad431ad8: Merge change Ia3acc2ee into eclair
Merge commit '09e27c4a9cc5bbddc2e18d66d396ee2cf4d753a3'

* commit '09e27c4a9cc5bbddc2e18d66d396ee2cf4d753a3':
  Fix pairings lost on reboot.
2009-11-22 22:17:07 -08:00
Jaikumar Ganesh
09e27c4a9c am 8631e554: am ad431ad8: Merge change Ia3acc2ee into eclair
Merge commit '8631e55425b2ab81eb74396e6834c6f7a4549804' into eclair-mr2-plus-aosp

* commit '8631e55425b2ab81eb74396e6834c6f7a4549804':
  Fix pairings lost on reboot.
2009-11-22 22:10:15 -08:00
Jaikumar Ganesh
8631e55425 am ad431ad8: Merge change Ia3acc2ee into eclair
Merge commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60' into eclair-mr2

* commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60':
  Fix pairings lost on reboot.
2009-11-22 22:02:17 -08:00
Android (Google) Code Review
ad431ad863 Merge change Ia3acc2ee into eclair
* changes:
  Fix pairings lost on reboot.
2009-11-22 21:54:29 -08:00
Mike Lockwood
983ee099de Fix deadlock in WindowManagerService.reenableKeyguard()
If reenableKeyguard() is called before the previous disableKeyguard() call is processed,
then TokenWatcher.sendNotificationLocked() will cancel the request, resulting in neither
the TokenWatcher acquired() or released() methods being called.
In that case, reenableKeyguard() will hang waiting for released() to set
mWaitingUntilKeyguardReenabled to false.  Now we only wait in reenableKeyguard()
if the TokenWatcher acquired() method is called and the keyguard has actually been disabled.

This should fix bug b/2270192

Change-Id: Id886fb28df607dbb4543124f2db6997121d6a682
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-22 02:00:13 -05:00
Dan Egnor
1691f3d3e8 Add CPUFREQ_STATS event tag
DO NOT MERGE
2009-11-21 11:11:09 -08:00
Dan Egnor
494a1dc5e9 Add OperationScheduler (and test) to the common static library;
includes new string parsing function (and test).
2009-11-21 10:09:46 -08:00
Eric Laurent
0b74d40ac1 am 86526461: am 949c572a: am e7800946: Merge change I49f02be9 into eclair
Merge commit '8652646105a6ace559280b579ee8935541ada6c1'

* commit '8652646105a6ace559280b579ee8935541ada6c1':
  Issue 2265163: Audio still reported routed through earpiece on sholes
2009-11-21 00:29:36 -08:00
Eric Laurent
8652646105 am 949c572a: am e7800946: Merge change I49f02be9 into eclair
Merge commit '949c572a16881aa40079a42bf7682637b23eb16a' into eclair-mr2-plus-aosp

* commit '949c572a16881aa40079a42bf7682637b23eb16a':
  Issue 2265163: Audio still reported routed through earpiece on sholes
2009-11-21 00:26:09 -08:00
Eric Laurent
949c572a16 am e7800946: Merge change I49f02be9 into eclair
Merge commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff' into eclair-mr2

* commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff':
  Issue 2265163: Audio still reported routed through earpiece on sholes
2009-11-21 00:21:15 -08:00
Android (Google) Code Review
e7800946a4 Merge change I49f02be9 into eclair
* changes:
  Issue 2265163: Audio still reported routed through earpiece on sholes
2009-11-21 00:18:24 -08:00
Scott Main
71372be6c2 am acedb7d0: am 30a4b8a1: am 256da9fb: am 160ab363: Merge change I0c172ebf into eclair-sdk
Merge commit 'acedb7d0c3452ff7347fec8f643034e938a55137'

* commit 'acedb7d0c3452ff7347fec8f643034e938a55137':
  docs change for ESR: add platform notes document for
2009-11-20 17:19:51 -08:00
Scott Main
acedb7d0c3 am 30a4b8a1: am 256da9fb: am 160ab363: Merge change I0c172ebf into eclair-sdk
Merge commit '30a4b8a180813ae9a1846fdd7219ebe5592eb06b' into eclair-mr2-plus-aosp

* commit '30a4b8a180813ae9a1846fdd7219ebe5592eb06b':
  docs change for ESR: add platform notes document for
2009-11-20 17:12:37 -08:00
Scott Main
30a4b8a180 am 256da9fb: am 160ab363: Merge change I0c172ebf into eclair-sdk
Merge commit '256da9fb007ac0722a5b1854befda7e7bed2564e' into eclair-mr2

* commit '256da9fb007ac0722a5b1854befda7e7bed2564e':
  docs change for ESR: add platform notes document for
2009-11-20 17:08:09 -08:00
Scott Main
256da9fb00 am 160ab363: Merge change I0c172ebf into eclair-sdk
Merge commit '160ab363d738728456d561bb80d54d3448e7580a' into eclair

* commit '160ab363d738728456d561bb80d54d3448e7580a':
  docs change for ESR: add platform notes document for
2009-11-20 17:03:29 -08:00
Android (Google) Code Review
160ab363d7 Merge change I0c172ebf into eclair-sdk
* changes:
  docs change for ESR: add platform notes document for Android 2.0.1. Also update the homepage sdk and adp announcements.
2009-11-20 16:59:57 -08:00
Daniel Sandler
f60e108fa9 Don't block TIME_TICK broadcasts in the DigitalClock widget.
This change applies the fix -- originally by phanna in
https://android-git.corp.google.com/g/#change,33669 -- to
the com.android.internal.widget version of DigitalClock,
which is used by the keyguard and pattern lock screens.

Change-Id: I43f72dd144423e55f73ba52903d52163c8f65591
2009-11-20 19:55:07 -05:00
Dianne Hackborn
5d3ac273b0 am 131a5ee9: am dbf3d3ac: am af1f42be: Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
Merge commit '131a5ee9aeadb9057847a437a669dd61573f5c88'

* commit '131a5ee9aeadb9057847a437a669dd61573f5c88':
  Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
2009-11-20 16:54:36 -08:00
Scott Main
2edbbafdd5 docs change for ESR: add platform notes document for
Android 2.0.1. Also update the homepage sdk and adp announcements.

Bug: 2160782
Change-Id: I0c172ebf9449ac99865433b51a0a7366aa2ef020
2009-11-20 16:53:01 -08:00