6311 Commits

Author SHA1 Message Date
Dianne Hackborn
4e2e2c2154 am 19a06fe9: Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ics-mr1
* commit '19a06fe93cccb4b1dd224b8456969821a19b07ef':
  Fix issue #5755172: Soft menu key disappears when menu is open
2011-12-13 13:41:30 -08:00
Dianne Hackborn
73ab6a49db Fix issue #5755172: Soft menu key disappears when menu is open
We need to work more like before in determining whether the menu
key is needed -- in some cases look back in the window list to
determine this if we don't know the value from the current window.

This requires adding a new private flag indicating whether the
compat menu state is known for a window, which is set by
PhoneWindow as part of its existing process of computing the flag
for its own windows.

Now we can have a new API on WindowState to determine the value
of this flag for a window, which if needed walks back in the window list
to find a window the value is known for (or stops at what the policy
has determined is the top full-screen window, so we stop like we used
to at things like the lock screen or the bottom of an application).

Change-Id: I829de6d629b5af8bcb422cb85249ee4041c7205e
2011-12-13 11:32:11 -08:00
Jeff Sharkey
767cae2c76 am f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1
* commit 'f0bbc494d638f4c77e688bf9410027f453301559':
  Avoid NPE when missing network stats.
2011-12-13 10:52:27 -08:00
Jeff Sharkey
d04ff11d6f Avoid NPE when missing network stats.
Bug: 5750339
Change-Id: I4b739dbd076b270a5a2b2e2a1e0f6e445d8c124e
2011-12-12 18:51:26 -08:00
Chia-chi Yeh
2b6f8a92b4 am 46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1
* commit '46a4e81dbdc9a5f401b5a3c0d26dea2e42b61487':
  VPN: delete the "abort" file before starting VPN daemons.
2011-12-08 17:24:52 -08:00
Chia-chi Yeh
46a4e81dbd Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1 2011-12-08 17:22:16 -08:00
Chia-chi Yeh
c187273292 VPN: delete the "abort" file before starting VPN daemons.
Bug: 5714296
Change-Id: Idba41b9f3907747a84387ea4f3e930b3a185a06e
2011-12-08 16:51:41 -08:00
Irfan Sheriff
7fc4d0cd35 am 97ff7893: Merge "Fix wifi bring up at boot up" into ics-mr1
* commit '97ff7893321362020211fae3c5a52b95c3ec19e1':
  Fix wifi bring up at boot up
2011-12-08 16:01:47 -08:00
Irfan Sheriff
97ff789332 Merge "Fix wifi bring up at boot up" into ics-mr1 2011-12-08 15:59:26 -08:00
Irfan Sheriff
5401f0b87b Fix wifi bring up at boot up
Bug: 5719176
Change-Id: Iac879fc634f6ab6289b73c46931d754bc0af2f87
2011-12-08 15:50:47 -08:00
Irfan Sheriff
c384c28e27 am 583fdf00: Merge "Handle emergency call back mode correctly" into ics-mr1
* commit '583fdf0068ac46fb384a5aa2b193faf743f8221c':
  Handle emergency call back mode correctly
2011-12-08 12:23:11 -08:00
Irfan Sheriff
4494c90616 Handle emergency call back mode correctly
Bug: 5726996
Change-Id: I5815dd402bd73c530b9ba6d545d8956064949aa2
2011-12-08 11:31:52 -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
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
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
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
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
Dianne Hackborn
ee4fe291d3 am db904b47: Merge "Fix issue #5628789: Cannot set static/custom wallpaper after clearing Settings data" into ics-mr1
* commit 'db904b4782a4dfc9d81d5d0616dea3656893b539':
  Fix issue #5628789: Cannot set static/custom wallpaper after clearing Settings data
2011-11-30 10:21:49 -08:00
satok
4c3fa642ef Fix ConcurrentModificationException in TextServicesManagerService
Bug: 5687402
Change-Id: I59086f956b6ee618ff0e1b1034d767d9ae295848
2011-11-30 22:46:16 +09:00