6250 Commits

Author SHA1 Message Date
Dianne Hackborn
5e3064c67f am b54980d1: Merge "Fix issue #5588689: Black camera preview after coming back from gmail" into ics-mr1
* commit 'b54980d1d4d903f68cdfa952256afff01902cd94':
  Fix issue #5588689: Black camera preview after coming back from gmail
2011-11-28 16:54:56 -08:00
Dianne Hackborn
6d05fd3c79 Fix issue #5588689: Black camera preview after coming back from gmail
Make surface management between SurfaceView and the window manager
much more controlled, to ensure that SurfaceView always gets to report
the current surface is destroyed before the window manager actually
destroys it.

Also a small tweak to allow windows that have a wallpaper background
to still have a preview window.  This makes launching home after it
has been killed feel much more responsive.

Change-Id: I0d22cf178a499601a770cb1dbadef7487e392d85
2011-11-28 14:45:50 -08:00
Robert Greenwalt
e0c3a2e063 am eaeb4f4e: Merge "Fix some policy-base routing issues." into ics-mr1
* commit 'eaeb4f4e3c914550d28a042fb3d752efcf20ab9e':
  Fix some policy-base routing issues.
2011-11-23 11:27:04 -08:00
Robert Greenwalt
eaeb4f4e3c Merge "Fix some policy-base routing issues." into ics-mr1 2011-11-23 11:25:39 -08:00
Robert Greenwalt
e83d181606 Fix some policy-base routing issues.
Secondary nets sometimes come up with no routes, but parsing errors end up with null
routes getting added.  Trim that away.  Also added some dumpstate logging of the secondary
route tables and rules.

bug:5615697
Change-Id: I94c9d888bab958df44891b9117236436e046cc7f
2011-11-23 09:36:16 -08:00
satok
620e4e4de2 am 1a3c051b: Merge "Hide/show ime switch icon properly" into ics-mr1
* commit '1a3c051bcc787363d9154da4a8e8e562dda32926':
  Hide/show ime switch icon properly
2011-11-17 18:04:28 -08:00
satok
1a3c051bcc Merge "Hide/show ime switch icon properly" into ics-mr1 2011-11-17 18:02:09 -08:00
satok
3afd6c0d4d Hide/show ime switch icon properly
Bug: 5481999
Change-Id: I4b3dde7285a9ac49da8d5d1133fddd0807b03f4d
2011-11-18 09:15:18 +09:00
Jeff Sharkey
2940d06db7 am 8ac35e30: Merge "Only write network stats when already loaded." into ics-mr1
* commit '8ac35e30b29f3a3e81ed722621bf7f1de708455f':
  Only write network stats when already loaded.
2011-11-17 12:12:17 -08:00
Jeff Sharkey
8ac35e30b2 Merge "Only write network stats when already loaded." into ics-mr1 2011-11-17 12:10:02 -08:00
Jeff Sharkey
c506ff6150 Only write network stats when already loaded.
Bug: 5584564
Change-Id: Ife2a68804bf3691e9bccdc167807204bce8a85b2
2011-11-17 12:05:46 -08:00
Jeff Sharkey
44a08da47d am b9df01d3: Merge "Update NTP outside locks, log large trim events." into ics-mr1
* commit 'b9df01d39692c45b182c429015cc2086ef27db97':
  Update NTP outside locks, log large trim events.
2011-11-16 23:01:10 -08:00
Jeff Sharkey
b9df01d396 Merge "Update NTP outside locks, log large trim events." into ics-mr1 2011-11-16 22:59:13 -08:00
Daniel Sandler
6a6d1b9444 am d5decdcc: Merge "Disable desk dock apps." into ics-mr1
* commit 'd5decdccc64c59ad62de86c70dbe9ead12150cdc':
  Disable desk dock apps.
2011-11-16 22:35:29 -08:00
Daniel Sandler
d5decdccc6 Merge "Disable desk dock apps." into ics-mr1 2011-11-16 22:33:44 -08:00
Jeff Sharkey
684c54a2eb Update NTP outside locks, log large trim events.
Move NTP updates outside locks to avoid blocking ShutdownThread.  Add
logging around trim events that remove substantial history.  Include
history start in sample events.

Bug: 5627247, 5584564
Change-Id: If9bbd93842c710efcdec94e68da87e9e42a5f961
2011-11-16 17:58:47 -08:00
satok
0427550509 am e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1
* commit 'e5febfd5bd9b19a01383760b523476ba7f013a5c':
  Clean up the spell checker framework
2011-11-16 17:37:47 -08:00
satok
e5febfd5bd Merge "Clean up the spell checker framework" into ics-mr1 2011-11-16 17:35:54 -08:00
satok
060677f468 Clean up the spell checker framework
Change-Id: I64c0d813e53a4ebf8d7e63463e36f6900f1aa7d3
2011-11-17 09:40:56 +09:00
Dianne Hackborn
61ecac1a37 am 4c6a65bc: Merge "Maybe fix issue #5627399: java.lang.RuntimeException - While sign in..." into ics-mr1
* commit '4c6a65bc319feab120d40553d93b160908db2f6d':
  Maybe fix issue #5627399: java.lang.RuntimeException - While sign in...
2011-11-16 14:06:06 -08:00
Dianne Hackborn
ee9aef0b42 Maybe fix issue #5627399: java.lang.RuntimeException - While sign in...
...through setup wizard after wipe data

Deal with finish() being called when there are no running activities
on the stack.

Also some improved debugging output.

Change-Id: Ia1d3f3f7e7b79c06ca95c738081322fc80282e0d
2011-11-16 13:21:46 -08:00
Daniel Sandler
11ddf533a2 Disable desk dock apps.
When a device is attached to a desk dock, the
CATEGORY_DESK_DOCK intent will no longer be fired.
As a side effect, the "dock home" behavior (which captures
the home key for the dock app as long as the device is
docked) is now disabled for desk docks.

Car docks are unchanged.

Bug: 5591015
Change-Id: I7884f655913c31cf53b88cb2e2b371987be27f64
2011-11-16 11:10:03 -08:00
Dianne Hackborn
ae3184f75d am cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1
* commit 'cdec187a27b2acc34cd4df26b836b83362527d6a':
  Whoops, need to acquire lock.
2011-11-15 19:06:19 -08:00
Dianne Hackborn
7aa6d31240 Whoops, need to acquire lock.
Also increase time between reports to try to reduce the amount
of redundant spam we get.

Change-Id: Iedd7d743826fffa62ee431073cb7dfb49a00cea0
2011-11-15 16:12:30 -08:00
Dianne Hackborn
6cc19eae6b am 5f11d73c: Merge "Improve low memory dropbox reporting." into ics-mr1
* commit '5f11d73c918de72368ac5605c50f5fb9ac0457cb':
  Improve low memory dropbox reporting.
2011-11-15 14:42:13 -08:00
Dianne Hackborn
d8c98fee02 Improve low memory dropbox reporting.
The msg is now constructed to try to bin these reports in
interesting ways.  We'll see.  Also change the tag name from
watchdog to lowmem, since sharkey is kindly taking care of
the back-end to handle this.

Improve how we put processes into low memory states to better
poke things like home and the previous app.

Also clean up some debug output, and add a few new am comment
options for controlling the current debug app.

Change-Id: I562a931a95244a2727bb7a6e1fd80dec259cdae2
2011-11-15 14:15:58 -08:00
Michael Jurka
2502262ddf am 4b7494e0: Merge "Updating recent apps visuals on tablet" into ics-mr1
* commit '4b7494e07a44c0aa363379be463de70455a895f3':
  Updating recent apps visuals on tablet
2011-11-15 09:25:47 -08:00
Jeff Sharkey
ebf8c5d3ee am d968670d: Merge "Conservatively trim data usage stats." into ics-mr1
* commit 'd968670d8369e5d92ba9b7a45b3804d692a05a4e':
  Conservatively trim data usage stats.
2011-11-15 09:25:40 -08:00
Dianne Hackborn
0dfae92851 am 91c2b5ce: Merge "Improve low memory reporting." into ics-mr1
* commit '91c2b5cebe981fb894b7e6f053a8593c1d9db80f':
  Improve low memory reporting.
2011-11-15 09:25:20 -08:00
Michael Jurka
4b7494e07a Merge "Updating recent apps visuals on tablet" into ics-mr1 2011-11-14 23:53:34 -08:00
Michael Jurka
bfd24acd31 Updating recent apps visuals on tablet
- getting rid of blue glow (5529032)
- moving app icon position
- show message if there are no recent apps (5533332)
- fixing rare IllegalStateException on orientation change (5584344)

Change-Id: I2210e584957869c8f02339e6841daf39364a9dad
2011-11-14 23:49:10 -08:00
Jeff Sharkey
d968670d83 Merge "Conservatively trim data usage stats." into ics-mr1 2011-11-14 23:37:17 -08:00
Jeff Sharkey
7ee8658453 Conservatively trim data usage stats.
Instead of trusting NTP time alone, use the most-conservative of
system clock and NTP.

Bug: 5584564
Change-Id: I5dd87fc009959b1cf0a7d660e385a0b1a8be238b
2011-11-14 20:11:38 -08:00
Jason Simmons
fe48e39aeb resolved conflicts for merge of f10a5364 to ics-aah
Change-Id: I2d6ba86d7a1c4170a30805215ab727fbeac99726
2011-11-14 19:03:26 -08:00
Dianne Hackborn
91c2b5cebe Merge "Improve low memory reporting." into ics-mr1 2011-11-14 18:36:50 -08:00
Dianne Hackborn
8ec8d41aa6 Improve low memory reporting.
Change-Id: I42d56ab8026fd02232dd11dbfbc513fbc0a1a851
2011-11-14 18:27:24 -08:00
Dianne Hackborn
813075a678 Maybe fix issue #5405788: Device continuously opening and closing...
...the "Complete action using" dialog

I have never been able to reproduce this consistently, but here is
another stab in the twilight.  It looks like during boot we have
a potential race where we could reset the config sequence number after
we had gone through a config change, causing ActivityThread to ignore
a following config change.  Maybe this change will help.

Change-Id: I4b731df5fd5c63894ca2e9bd34693b31ab1c0565
2011-11-14 17:45:19 -08:00
Dianne Hackborn
391545ed22 am be70785f: Make activity manager more robust in the face of app activity leaks.
* commit 'be70785f9b2dbd2c52fd8676d99bc64b22784201':
  Make activity manager more robust in the face of app activity leaks.
2011-11-11 16:13:23 -08:00
Dianne Hackborn
be70785f9b Make activity manager more robust in the face of app activity leaks.
This came up from bug #5601885: Memory increase (leak?) in system_server
Stingray MR1

This isn't *really* a leak in the system process -- it is a leak in an
application process that is causing the system process to keep around
a bunch of ActivityRecord objects longer than it should, until that app
process is ultimately killed.

Unfortunately these days leaking an ActivityRecord also often means
leaking a thumbnail, which is a big slab of memory.

So make the activity manager better about this, using a weak reference
from the handle the object has so we can still clean away most of the
state associated with the ActivityRecord even if the client side leaks
its own reference.

Change-Id: Idbab45e09749cdfb54899203da7981e7b3576e25
2011-11-11 15:05:59 -08:00
Robert Greenwalt
3631261229 am 24597eb7: Merge "Tone down Tethering logs." into ics-mr1
* commit '24597eb77e1a88994b83c5b1f45d5b72383943b8':
  Tone down Tethering logs.
2011-11-11 14:39:10 -08:00
Robert Greenwalt
24597eb77e Merge "Tone down Tethering logs." into ics-mr1 2011-11-11 14:37:18 -08:00
Robert Greenwalt
fd1be2bc1e Tone down Tethering logs.
bug:5601582
Change-Id: I66c0a5a06a2c13a7cf93ea264d156b37df23745f
2011-11-11 14:09:45 -08:00
Robert Greenwalt
411290aa4b am 424781e2: Fix NPE in ConnectivityService.
* commit '424781e2e1a1f1447eea733ffd1dc0f8006b628e':
  Fix NPE in ConnectivityService.
2011-11-11 11:50:34 -08:00
Jeff Sharkey
94ca29d461 am 51c00a57: Merge "Clamp non-monotonic stats instead of dropping." into ics-mr1
* commit '51c00a57f4f956b4b0ce9562fa571b475ee6f6ae':
  Clamp non-monotonic stats instead of dropping.
2011-11-11 11:50:04 -08:00
Robert Greenwalt
3aedf91747 am 7c9f8005: Merge "Fix Wimax-less build." into ics-mr1
* commit '7c9f8005e20af0bb741e36d8239f301371ba5f7f':
  Fix Wimax-less build.
2011-11-11 11:49:45 -08:00
Robert Greenwalt
424781e2e1 Fix NPE in ConnectivityService.
If it's configured with a defined network but can't create a network state tracker
for it, it would NPE and restart the framework whenever a default network
disconnects.

bug:5603268
Change-Id: I816c4f522d766e0353a713623f6635b03395b01e
2011-11-11 09:56:03 -08:00
Jeff Sharkey
51c00a57f4 Merge "Clamp non-monotonic stats instead of dropping." into ics-mr1 2011-11-10 20:31:03 -08:00
Jeff Sharkey
d4ef8c8fc9 Clamp non-monotonic stats instead of dropping.
When encountering non-monotonic stats rows, recover remaining data by
clamping to 0.  In particular, this avoids edge-case where persisting
threshold checks would never trigger.  Also recover when tethering
snapshots are missing.

Bug: 5600785, 5433871, 5600678
Change-Id: I1871954ce3955cc4ac8846f9841bae0066176ffe
2011-11-10 17:54:23 -08:00
Robert Greenwalt
7c9f8005e2 Merge "Fix Wimax-less build." into ics-mr1 2011-11-10 17:22:14 -08:00
Robert Greenwalt
6537b02875 Fix Wimax-less build.
A build with the wimax network type defined but wimax disabled
causes an NPE in ConnectivityService's constructor.

bug:5237167
Change-Id: I929eac217e1afa0e61346fdbc3e96a7d3ad09a54
2011-11-10 17:14:05 -08:00