1342 Commits

Author SHA1 Message Date
Eric Laurent
2685607d59 am da4cc343: Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
Merge commit 'da4cc34308d65730c404b669926a92e37b378555' into eclair-plus-aosp

* commit 'da4cc34308d65730c404b669926a92e37b378555':
  Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
2009-12-14 11:57:42 -08:00
Eric Laurent
da4cc34308 Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).
The problem is due to spurious headset connection indications received from event observer when a 3.5mm headset w/o mic is connected.
In this particular case, The HeadsetObserver first received a valid indication of headset with mic connection, followed by a headset with mic disconnection and finally a headset w/o mic connection.
The HeadsetObserver delays the headset disconnection intent to leave time to music app to pause music before the output path is switched.
As the last headset w/o mic connection indication is received from the event observer before the intent corresponding to the spurious headset with mic disconnection is broadcast, the later is discarded. Results a state where the headset with mic is always considered as connected.

The fix consists in not canceling pending intents when a new headset state is received and carrying the HeadsetObserver state with the delayed message triggering the broacast of the disconnection intent.
2009-12-14 03:45:41 -08:00
Dianne Hackborn
7a7c95ea25 am 9b52a218: Fix #2269582 Sometimes camera preview screen is truncated
Merge commit '9b52a2184e99565bcd7f77effb321c95a2a4837e' into eclair-plus-aosp

* commit '9b52a2184e99565bcd7f77effb321c95a2a4837e':
  Fix #2269582 Sometimes camera preview screen is truncated
2009-12-11 18:56:47 -08:00
Dianne Hackborn
9b52a2184e Fix #2269582 Sometimes camera preview screen is truncated
There were a few places in the window manager where we wouldn't cause
a layout after making a window visible.  This would leave it using
whatever size and position it last have since we don't layout windows
when they are not visible.

Also includes a little part I missed in the security issue that
allowed wallpapers to see input on the lock screen.

Change-Id: Icd7e037ad9a67ac936bc7039d87ed68f49502d73
2009-12-11 18:35:07 -08:00
Dianne Hackborn
e9b86b5421 am 474731d5: Merge change I2ffe306f into eclair
Merge commit '474731d5efb30c1e9184f998610054747eb8e764' into eclair-plus-aosp

* commit '474731d5efb30c1e9184f998610054747eb8e764':
  Fix issue #2304284: contacts/dialer/recentcalls constantly flashing
2009-12-11 18:28:45 -08:00
Android (Google) Code Review
474731d5ef Merge change I2ffe306f into eclair
* changes:
  Fix issue #2304284: contacts/dialer/recentcalls constantly flashing
2009-12-11 18:25:21 -08:00
Dianne Hackborn
871ecdce67 Fix issue #2304284: contacts/dialer/recentcalls constantly flashing
Make sure the application is always given the most recent configuration
when launcher.  Use the current configuration, instead of whatever happens
to be set by the app, for reporting what it was launched with.

Change-Id: I2ffe306f56cc9092b640546dd0a28d2c29b9c0b3
2009-12-11 15:24:33 -08:00
Christopher Tate
dfcabffa30 am 2624fbca: Fix #2320798: Device hang then runtime restart
Merge commit '2624fbcaaa74b3a6d8d60d22d9e16ef26a98a6b2' into eclair-plus-aosp

* commit '2624fbcaaa74b3a6d8d60d22d9e16ef26a98a6b2':
  Fix #2320798: Device hang then runtime restart
2009-12-11 13:05:57 -08:00
Christopher Tate
2624fbcaaa Fix #2320798: Device hang then runtime restart
The system_server process is deadlocking between event dispatch and window
manager code.  This change fixes the lock scoping to eliminate the deadlock.

Change-Id: I00f029e4d51d7432119ad3aeec260df215b52546
2009-12-11 12:49:33 -08:00
Dianne Hackborn
bd5c9d23d3 am d3cfb1bd: Merge change Ia48b3f2a into eclair
Merge commit 'd3cfb1bd84affbf740256f5e9804c93ef7722b37' into eclair-plus-aosp

* commit 'd3cfb1bd84affbf740256f5e9804c93ef7722b37':
  Fix #2313887: Device doesn't boot after rebooting device...
2009-12-09 18:48:42 -08:00
Dianne Hackborn
f3bea9cb75 Fix #2313887: Device doesn't boot after rebooting device...
...in setup wizard ->Wifi setup screen.

We were stopped waiting for the wallpaper to draw, which it would never do
because it had been obscured and thus hidden.

Change-Id: Ia48b3f2a46ca970f143cbaee99f5f2a054378986
2009-12-09 18:26:21 -08:00
Dianne Hackborn
362da10cfe am e851cdc6: Merge change Ifd95b9f5 into eclair
Merge commit 'e851cdc6c48c977d05096847001a0601d892fd55' into eclair-plus-aosp

* commit 'e851cdc6c48c977d05096847001a0601d892fd55':
  Fix #2313382: SECURITY: Live wallpapers get touch events through the lock screen.
2009-12-08 18:44:22 -08:00
Dianne Hackborn
00c1fc97c1 Fix #2313382: SECURITY: Live wallpapers get touch events through the lock screen.
This is a quick and dirty hack to not deliver touch events to the wallpaper when
they are being sent to the keyguard.  Perhaps we should have a separate window
flag for this, but...  bleah.  Maybe later.  Or maybe I'll use that secure flag.
Or something.

Change-Id: Ifd95b9f5b10db24a0854a93b925a833b24331b4c
2009-12-08 15:51:43 -08:00
Robert Greenwalt
c7a34f4430 am 9ae9763b: Merge change Ib097fbbf into eclair
Merge commit '9ae9763b7e5dd872619b13c889b72b0df176f956' into eclair-plus-aosp

* commit '9ae9763b7e5dd872619b13c889b72b0df176f956':
  DO NOT MERGE  Reverting change I53e91db7.
2009-12-07 15:31:29 -08:00
Jaikumar Ganesh
8646076fb4 am 9d3cb9bf: Merge change I204e4787 into eclair
Merge commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564' into eclair-plus-aosp

* commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564':
  Fix updating Bluetooth icon on status bar and for Wifi.
2009-12-07 15:31:24 -08:00
Android (Google) Code Review
9ae9763b7e Merge change Ib097fbbf into eclair
* changes:
  DO NOT MERGE  Reverting change I53e91db7.
2009-12-07 15:27:19 -08:00
Android (Google) Code Review
9d3cb9bfc6 Merge change I204e4787 into eclair
* changes:
  Fix updating Bluetooth icon on status bar and for Wifi.
2009-12-07 15:27:02 -08:00
Robert Greenwalt
b097fbbff3 DO NOT MERGE Reverting change I53e91db7.
Accidentally submitted into eclair instead of eclair-mr2.
I apparently rebased my mr2 working dir to eclair by mistake.

Do not merge this so the desired change will survive on mr2 as intended.

bug: 2265222
2009-12-07 15:20:50 -08:00
Jaikumar Ganesh
084c665421 Fix updating Bluetooth icon on status bar and for Wifi.
Status bar uses the SINK_STATE_CHANGE intent to determine the icon.
This intent also has the device. Thus, we can get this intent for any
device and we update the icon wrongly. The same problem is with Wifi.

This was not commonly observed till now, but with the car dock changes
its easy to reproduce as we can get an incoming connection from the
car's bluetooth system. For Wifi, this will cause coexistance issues
especially with desk docks.

Dr No: Eastham
Bug: 2133530
2009-12-07 15:16:22 -08:00
Robert Greenwalt
22de2aecab am 90d1b745: Merge change I53e91db7 into eclair
Merge commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3' into eclair-plus-aosp

* commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3':
  Filter out minor Connectivity Notifications.
2009-12-07 15:09:30 -08:00
Robert Greenwalt
511288a046 Filter out minor Connectivity Notifications.
Don't send a connectivity change notification if the change is in detailed state only.
IE, Disconnect/Idle -> Disconnect/Scanning should not trigger a connection change
notification.

bug: 2265222
2009-12-07 14:20:08 -08:00
Suchi Amalapurapu
3f075ad943 am ae952b3b: Merge change Ibe1c422a into eclair
Merge commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7' into eclair-plus-aosp

* commit 'ae952b3bcc3eb744cceb5cd0ae65b2c7a83f9de7':
  If the usage stats file doesn't exist in the first place there is no need to
2009-12-04 15:01:57 -08:00
Suchi Amalapurapu
be1c422a73 If the usage stats file doesn't exist in the first place there is no need to
backup and short return.
2009-12-04 13:59:38 -08:00
Jaikumar Ganesh
2e1ff896cc am 8c411fb1: Merge change I79420b02 into eclair
Merge commit '8c411fb13923d1fa28fcd98452bf3d17b8b1a338' into eclair-plus-aosp

* commit '8c411fb13923d1fa28fcd98452bf3d17b8b1a338':
  Add support for Car Dock.
2009-12-03 12:01:17 -08:00
Android (Google) Code Review
8c411fb139 Merge change I79420b02 into eclair
* changes:
  Add support for Car Dock.
2009-12-03 11:49:38 -08:00
Jaikumar Ganesh
3fbf7b62bb Add support for Car Dock.
Dr No: Eastham
Bug: 2133530
2009-12-03 11:35:37 -08:00
Mike Lockwood
0d26301ba4 am 678c2e35: Merge change I9ef88863 into eclair
Merge commit '678c2e35768a5426b4ad8f67c836008e7751a353' into eclair-plus-aosp

* commit '678c2e35768a5426b4ad8f67c836008e7751a353':
  Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
2009-12-03 11:12:47 -08:00
Mike Lockwood
435eb6464c Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Part of a fix for bug b/2300622 (Proximity sensor always blows up the lock screen while in call)

Change-Id: I9ef888638b19540a78a34507d52ff522f505102f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-12-03 08:56:53 -05:00
Joe Onorato
4ceb0f3855 am 19a4157c: Make the notification panel send the position as well.
Merge commit '19a4157ce40f4ab77b60445b8e73069c5877bb8a' into eclair-plus-aosp

* commit '19a4157ce40f4ab77b60445b8e73069c5877bb8a':
  Make the notification panel send the position as well.
2009-12-02 23:34:17 -08:00
Joe Onorato
19a4157ce4 Make the notification panel send the position as well. 2009-12-02 23:26:27 -08:00
Dianne Hackborn
fa99f378f7 am dcd58cfd: Merge change I7b9328c7 into eclair
Merge commit 'dcd58cfda366c915b1f0739cb115f9d972351c73' into eclair-plus-aosp

* commit 'dcd58cfda366c915b1f0739cb115f9d972351c73':
  Fix issue #2300232: Bugs in resolving conflicting pointers
2009-12-02 18:56:21 -08:00
Dianne Hackborn
709d6db48d Fix issue #2300232: Bugs in resolving conflicting pointers
Change-Id: I7b9328c7a1c4f6b731e64cdca2ed9de71b84587f
2009-12-02 18:42:39 -08:00
Mike Lockwood
fbe460e888 am 9b7dba93: Merge change Icc49422a into eclair
Merge commit '9b7dba936c24fa7959561ddf1a0c8ba4d2165782' into eclair-plus-aosp

* commit '9b7dba936c24fa7959561ddf1a0c8ba4d2165782':
  Implement new notification LED blinking logic:
2009-12-02 16:30:30 -08:00
Mike Lockwood
c22404a4e7 Implement new notification LED blinking logic:
1) Do not pulse notification LED when screen is on.
2) Pulse once on new notification if Settings.System.NOTIFICATION_LIGHT_PULSE is false,
   otherwise pulse persistently while screen is off.

Fixes part of bug b/2238250 (trackball should pulse occasionally to indicate new email)

Change-Id: Icc49422a4e9d14412fc159a8e2596503a85bac51
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-12-02 14:30:13 -05:00
Dianne Hackborn
0b63b9fb56 am 5886050f: Merge change I0d8f7593 into eclair
Merge commit '5886050fad97923c33cbc831fe07a5b1746b2b58' into eclair-plus-aosp

* commit '5886050fad97923c33cbc831fe07a5b1746b2b58':
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
2009-12-01 17:10:27 -08:00
Dianne Hackborn
a7ca0e5e32 Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
Change-Id: I0d8f75938226e1bb49cf7b1154445631b0bb0bc9
2009-12-01 14:31:55 -08:00
Mike Lockwood
2746a1efb1 am abf7fed2: Merge change I2b7c8a32 into eclair
Merge commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6' into eclair-plus-aosp

* commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6':
  Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
2009-11-30 16:47:18 -08:00
Android (Google) Code Review
abf7fed21b Merge change I2b7c8a32 into eclair
* changes:
  Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
2009-11-30 16:39:53 -08:00
Mike Lockwood
5db4240012 Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
This fixes another case where the screen would turn on when the keyguard is open but hidden by another activity.

Change-Id: I2b7c8a329036401709e96ded4f4c138041192a71
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-30 14:51:51 -05:00
Eric Laurent
55da000c1d am bb3bb57a: Merge change I524dc046 into eclair
Merge commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3' into eclair-plus-aosp

* commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3':
  Fix issue 2192673: Music Pausing Even when notifications are set to silent.
2009-11-30 10:05:52 -08:00
Eric Laurent
524dc046b1 Fix issue 2192673: Music Pausing Even when notifications are set to silent.
Do not play ringtones, notifications or camera sounds if ringer mode is silent.
2009-11-27 05:07:55 -08:00
Dianne Hackborn
85af68c82a am 118d92f7: Merge change I16925b91 into eclair
Merge commit '118d92f73fe9dd1cc9cb900205cd1ec0dac28a1b' into eclair-plus-aosp

* commit '118d92f73fe9dd1cc9cb900205cd1ec0dac28a1b':
  Finish fixing issue #2228381: android.view.InflateException...
2009-11-24 14:51:37 -08:00
Dianne Hackborn
195f6a0ff3 Finish fixing issue #2228381: android.view.InflateException...
...Binary XML file line #37: Error inflating class <unknown> after adding a secondary account

The problem was that we weren't dealing well with the situation where we start a transition
from activity A to B, then transition back to A before B is shown (it finishes before being
shown), then transition from A to C.  At this point we had some state showing that we
were in the process of showing A from it being hidden (due to the middle transition from
B to A), which would cause the layout pass to ensure its window is hidden before the
transition starts.

The solution is to detect the case where we are showing a token and it is already actually
shown, and in this case not do all of the token setup for it to wait for its windows to
be displayed before it is shown.  This isn't needed, the windows are already displayed
or the token is already set up to wait for them to be displayed.

Change-Id: I16925b91e1e2449dd65ade162a5758173c6e2695
2009-11-24 11:34:55 -08:00
Dianne Hackborn
6f8797a7b1 am 05799981: Fix issue #2281046: Size and pressure don\'t change
Merge commit '05799981d8d930e0b929cdb99f9407e3ee18c142' into eclair-plus-aosp

* commit '05799981d8d930e0b929cdb99f9407e3ee18c142':
  Fix issue #2281046: Size and pressure don't change
2009-11-23 15:58:56 -08:00
Dianne Hackborn
05799981d8 Fix issue #2281046: Size and pressure don't change
Change-Id: Iadc1d438a494bb1495ee6d93d0dd3b4a491a378f
2009-11-23 15:49:15 -08:00
Eric Olsen
90face60c6 am 0d631b9b: Merge change Ie7096ebb into eclair
Merge commit '0d631b9b58db54bee58da717b38b8020bc3d0437' into eclair-plus-aosp

* commit '0d631b9b58db54bee58da717b38b8020bc3d0437':
  Add logging of headset events to help debug issue.
2009-11-23 13:54:40 -08:00
Eric Olsen
e7096ebba1 Add logging of headset events to help debug issue.
Signed-off-by: Eric Olsen <eolsen@android.com>
2009-11-23 13:06:07 -08:00
Eric Laurent
a0b6c0261a am a0f9a4f7: Merge change I2083b297 into eclair
Merge commit 'a0f9a4f73579c2afa4dd82499a69abce94a3f23f' into eclair-plus-aosp

* commit 'a0f9a4f73579c2afa4dd82499a69abce94a3f23f':
  Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.
2009-11-23 11:16:57 -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
75732ac4a8 am 8abd5f0d: Fix issue #2267665 IME keyboard appears as Blank in compose view...
Merge commit '8abd5f0d519afa787e7c64e429df17ccc661ce75' into eclair-plus-aosp

* commit '8abd5f0d519afa787e7c64e429df17ccc661ce75':
  Fix issue #2267665 IME keyboard appears as Blank in compose view...
2009-11-23 11:05:58 -08:00