7804 Commits

Author SHA1 Message Date
Irfan Sheriff
4494c90616 Handle emergency call back mode correctly
Bug: 5726996
Change-Id: I5815dd402bd73c530b9ba6d545d8956064949aa2
2011-12-08 11:31:52 -08:00
Jeff Brown
216cc49c5f am e0e9fd98: Merge "Fix system hotkey handling." into ics-mr1
* commit 'e0e9fd981ca71aeaa45c888485c11788456bd838':
  Fix system hotkey handling.
2011-12-07 23:30:51 -08:00
Jeff Brown
e0e9fd981c Merge "Fix system hotkey handling." into ics-mr1 2011-12-07 23:29:45 -08:00
Jeff Brown
68b909d8ac Fix system hotkey handling.
Fixed a problem where the key up for the ALT or META key was not
delivered to the task switcher dialog because it was deemed
to be inconsistent with the window's observed state.  Consequently
the dialog would not be dismissed when the key was released.

Moved global hotkey handling for META+* shortcuts and ALT/META-TAB
into the window manager policy's interceptKeyBeforeDispatching
method.  This change prevents applications from hijacking these
keys.

The original idea was that these shortcuts would be handled only
if the application did not handle them itself.  That way certain
applications, such as remote desktop tools, could deliberately
override some of these less important system shortcuts.
Unfortunately, that does make the behavior inconsistent across
applications.  What's more, bugs in the onKeyDown handler of
applications can cause the shortcuts to not work at all, for
no good reason.

Perhaps we can add an opt-in feature later to enable specific
applications to repurpose these keys when it makes sense.

Bug: 5720358
Change-Id: I22bf17606d12dbea6549c60d20763e6608576cf7
2011-12-07 21:37:16 -08:00
Dianne Hackborn
1a4822d6cc am 87e06ec2: Merge "Fix issue #5144065: Tap on Music icon from Home screen..." into ics-mr1
* commit '87e06ec2fa57a54b92fe82f2cacfbf8a44e47baf':
  Fix issue #5144065: Tap on Music icon from Home screen...
2011-12-07 16:04:29 -08:00
Dianne Hackborn
87e06ec2fa Merge "Fix issue #5144065: Tap on Music icon from Home screen..." into ics-mr1 2011-12-07 15:01:55 -08:00
Jason Simmons
0d77f84d0c Merge "Add an option that disables the AUDIO_BECOMING_NOISY intent send when a headset is hotplugged." into ics-aah 2011-12-07 14:36:39 -08:00
Winson Chung
7992f3e541 am 0a361b10: Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)" into ics-mr1
* commit '0a361b10a665a3d158c846722290f26ce62276e1':
  Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)
2011-12-07 14:35:59 -08:00
Winson Chung
0a361b10a6 Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)" into ics-mr1 2011-12-07 14:33:31 -08:00
Dianne Hackborn
ae0a0a84d1 Fix issue #5144065: Tap on Music icon from Home screen...
... a different app opens

In some cases when reparenting activities we could end up with a reply
chain that crosses task boundaries, so if an activity below that needs
to be reparented we pull that and the activities above it up into the
new task.

Change-Id: Ia4fa041ab7069e39dac162ddbf5b8e1de98675b9
2011-12-07 14:03:01 -08:00
Jason Simmons
aab52cd442 Add an option that disables the AUDIO_BECOMING_NOISY intent send when a headset is hotplugged.
HDMI audio hotplug is treated as a "headset" in the audio services.  When a headset is unplugged,
WiredAccessoryObserver sends an AUDIO_BECOMING_NOISY broadcast so that applications can take
appropriate action (e.g. pausing audio if headphones were unplugged).

However, on Tungsten, when you unplug HDMI audio, the Music2 service was getting the NOISY intent
and pausing the transmitter media player.  We could add Tungsten-specific code to Music2 to
disable this behavior, but it's probably better to disable this broadcast entirely because
applications on Tungsten probably shouldn't treat HDMI hotplug in the same way they treat
headphone hotplug on phones.

Change-Id: I2d2b913f74f51fb496bd2f00f32e109bbff01fa1
2011-12-07 13:52:23 -08:00
Irfan Sheriff
5ea9ea6537 am a85cc282: Merge "Fix CS wakelock handling" into ics-mr1
* commit 'a85cc28229c2d5114fcc83c3d7ebfd6894fd4b98':
  Fix CS wakelock handling
2011-12-07 12:08:01 -08:00
Irfan Sheriff
87f0a7b1aa Fix CS wakelock handling
Change-Id: Ibe1c1ab3e26ff0ae7cab7bfb0bd868bfab246037
2011-12-07 11:28:21 -08:00
Winson Chung
c3f581b047 Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)
Change-Id: Ic57a7ce85f41d58cd40b7d30eef4a1bf685182e5
2011-12-06 14:21:10 -08:00
Jason Simmons
3b282fae37 resolved conflicts for merge of 0c0120ef to ics-aah
Change-Id: If1f39ff160b4305ef057d50bb1f01d2c45f1579d
2011-12-06 11:11:13 -08:00
John Grossman
7dc935ad17 Merge "AudioFlinger: Make StandbyTime configurable." into ics-aah 2011-12-06 10:04:38 -08:00
John Grossman
77e2cf7821 AudioFlinger: Make StandbyTime configurable.
Make the standby time for AudioFlinger configurable using a system
property.  Default AudioFlinger behavior is to go into standby
(allowing the audio outputs to underflow) after there has been nothing
to mix and AudioFlinger has just been pumping out silence for the
configured standby time (which defaulted to 3 seconds).

Now, by setting the "ro.audio.flinger_standbytime_ms" property in
their platform init.rc, platforms can override this default and
control the standby time.  If the property is missing or malformed,
the old default value of 3 seconds will be used instead.

Change-Id: Ic9fa8b5f5bccee493bc72c65e408d3fd8ddd1059
Signed-off-by: John Grossman <johngro@google.com>
2011-12-06 10:02:29 -08:00
Dianne Hackborn
0c0120efa2 Merge "Fix issue #5714517: App shortcuts can result in bad task intents" into ics-mr1 2011-12-05 19:16:54 -08:00
Dianne Hackborn
3c585e92ed am 52245ac7: Merge "Fix issue #5713576: Home redraws after returning from app on Nexus S 4G" into ics-mr1
* commit '52245ac7c41735c561199d9ec7e9577d592ca852':
  Fix issue #5713576: Home redraws after returning from app on Nexus S 4G
2011-12-05 19:09:19 -08:00
Dianne Hackborn
52245ac7c4 Merge "Fix issue #5713576: Home redraws after returning from app on Nexus S 4G" into ics-mr1 2011-12-05 19:07:52 -08:00
Dianne Hackborn
77eaaf04c6 Fix issue #5713576: Home redraws after returning from app on Nexus S 4G
Turn of destroying of activities during memory trimming.

Change-Id: Ibea415c13fca4f67f56adefe81a1495f5f9ad273
2011-12-05 19:00:42 -08:00
Dianne Hackborn
f5b8671c34 Fix issue #5714517: App shortcuts can result in bad task intents
New API to let you build an Intent whose base configuration is correct,
but has an additional "selector" to pick out the specific app that you
would like launched.

Change-Id: Ide9db6dc60e2844b7696cfe09b28337fe7dd63db
2011-12-05 17:42:41 -08:00
Eric Laurent
5a27892437 am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
* commit '7b6aff23735a9ef8759c5ecb4427784413e9b85b':
  audioflinger: fix audio skipping over A2DP
2011-12-05 17:22:46 -08:00
Eric Laurent
7b6aff2373 Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1 2011-12-05 17:20:53 -08:00
Eric Laurent
4433169a64 audioflinger: fix audio skipping over A2DP
The maximum sleep time allowed in the mixer thread when audio tracks
are enabled but not ready for mixing is derived from the latency
reported by the output stream.
This does not work for A2DP where the latency also reflects encoding, decoding
and transfer time.

Modified activeSleepTimeUs() to take A2DP case into account.

Issue 5682206.

Change-Id: I3784ac01fb6f836b5a6ce6f764fb15347586de35
2011-12-05 10:40:18 -08:00
Jesse Hall
18bd6bdbf0 am f57c1388: Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1
* commit 'f57c1388860486a70cc773f2cfeaa3ea3b38a473':
  SurfaceFlinger: fix layer removal race condition
2011-12-02 18:32:22 -08:00
Jesse Hall
8a7c940eff SurfaceFlinger: fix layer removal race condition
Layer::lockPageFlip() and layer::onRemove() could be called on
different threads and race such that lockPageFlip() successfully
called mSurfaceTexture->updateTexImage() but then gets NULL back from
mSurfaceTexture->getCurrentBuffer(), leading to a crash.

This change moves Layer::onRemove() calls to
SurfaceFlinger::commitTransaction() so they happen after the Layer is
done being drawn from and only happen on the main surfaceflinger
thread.

Change-Id: I4b550caadff4cc1878d7c3bca6129193fb0c713e
2011-12-02 10:03:25 -08:00
Kenny Root
e91d0d81fe am 5a7c9176: Merge "Fix free_cache to actually work" into ics-mr1
* commit '5a7c91769f011bc150c9def9edab9cccb4761c66':
  Fix free_cache to actually work
2011-12-01 14:16:24 -08:00
Kenny Root
5a7c91769f Merge "Fix free_cache to actually work" into ics-mr1 2011-12-01 14:14:22 -08:00
Dianne Hackborn
59aaeb9f2e am 55e81bd0: Merge "Improve how we manage the previous app." into ics-mr1
* commit '55e81bd0f219acbe00bbeebc8d33ef9c67a4aa60':
  Improve how we manage the previous app.
2011-12-01 12:49:24 -08:00
Dianne Hackborn
55e81bd0f2 Merge "Improve how we manage the previous app." into ics-mr1 2011-12-01 12:47:43 -08:00
Dianne Hackborn
50685606cf Improve how we manage the previous app.
Setting it when a new activity is being resumed is too soon, because
things like an activity launching an exiting (without being seen by
the user) can knock out the real previous app that we want.

So now we set it when an activity is stopped.  At this point it is
going to move from the preceptible to background oom adj, so it is
a good point to determine whether it should be a previous app to
instead put it to that oom adj.  This also avoids things like
activities that start and immediately finish from impacting the
previous app.

Further, we keep track of the time each activity was last shown, and
use this to further filter what is set as the previous app.

Change-Id: I72d1cac4de0cc2d4598170296028f11b06918d4f
2011-12-01 12:23:37 -08:00
Kenny Root
ad757e9b36 Fix free_cache to actually work
This broke with some other path-related changes, so it was scanning for
/data/*/cache instead of /data/data/*/cache

Also remove redundant call to restat

Bug: 5686310
Change-Id: Id1661f0f1337858fc9ead53c56ab7557f421c591
2011-12-01 09:07:55 -08:00
Daniel Sandler
c0fc5d81b8 am 2a40d0d9: Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1
* commit '2a40d0d92b208021b492e9af3d944720cbf269fc':
  Put screensavers back in the icebox for now. DO NOT MERGE.
2011-12-01 06:31:12 -08:00
Daniel Sandler
2a40d0d92b Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1 2011-12-01 06:29:53 -08:00
satok
eaf9507271 am b94a7fb3: Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1
* commit 'b94a7fb3d7483e8b47e4f0229fc7abff10a6572d':
  Fix ConcurrentModificationException in TextServicesManagerService
2011-11-30 17:39:26 -08:00
satok
b94a7fb3d7 Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1 2011-11-30 17:37:52 -08:00
Svetoslav Ganov
1c45ac8a1c am d8ec8db5: Merge "Fixing memory leaks in the accessiiblity layer." into ics-mr1
* commit 'd8ec8db5e0f227e4f63e948acb78d829f5ad30c8':
  Fixing memory leaks in the accessiiblity layer.
2011-11-30 16:59:11 -08:00
Svetoslav Ganov
d8ec8db5e0 Merge "Fixing memory leaks in the accessiiblity layer." into ics-mr1 2011-11-30 16:56:41 -08:00
Dianne Hackborn
bf30ac71a9 am 88f10c6c: Merge "Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1
* commit '88f10c6ce5a97b1990934148deb8ed6aa6ef7a48':
  Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?
2011-11-30 14:15:55 -08:00
Dianne Hackborn
3d11e09ef4 am f8d20bd6: Merge "Turn off debug log." into ics-mr1
* commit 'f8d20bd6495883e98e23827a2e5ed03766fe483b':
  Turn off debug log.
2011-11-30 14:13:28 -08:00
Dianne Hackborn
88f10c6ce5 Merge "Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1 2011-11-30 14:12:44 -08:00
Dianne Hackborn
f8d20bd649 Merge "Turn off debug log." into ics-mr1 2011-11-30 14:11:17 -08:00
Mathias Agopian
9440f3ee3c am e8ba2aba: Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1
* commit 'e8ba2aba934e3767d2081007bba93bad68566d22':
  add a way to access the version string of the h/w implementation of EGL
2011-11-30 13:54:16 -08:00
Mathias Agopian
e8ba2aba93 Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1 2011-11-30 13:52:21 -08:00
Daniel Sandler
d2b22a885a Put screensavers back in the icebox for now. DO NOT MERGE.
Bug: 5689684
Change-Id: I3a5291c3520bb43e35d55714f1522e4ae7f6e63c
2011-11-30 15:47:36 -05:00
Daniel Sandler
7e6f42945b am 865b9802: Merge "Expanding NotificationManager\'s event logging." into ics-mr1
* commit '865b98024fb5fa21854feb578b8816bbb72120ba':
  Expanding NotificationManager's event logging.
2011-11-30 11:55:53 -08:00
Daniel Sandler
865b98024f Merge "Expanding NotificationManager's event logging." into ics-mr1 2011-11-30 11:54:17 -08:00
Dianne Hackborn
bbb09aceb6 Turn off debug log.
Change-Id: I1d4612133580d493d81d0b15752e009202e95ce0
2011-11-30 11:40:40 -08:00
Dianne Hackborn
1fbee79eb3 Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?
Calls to get the display size no longer need to acquire the global
window lock.

Change-Id: I751ea6ed0e20f1f521783f4bd5a8f9c31cd43573
2011-11-30 11:29:58 -08:00