6240 Commits

Author SHA1 Message Date
Nick Kralevich
8549aeea0a Merge "Rename EntropyService to EntropyMixer" 2011-11-17 15:30:46 -08:00
Jeff Sharkey
f0c22dc4a0 am 7892cbff: am 8ac35e30: Merge "Only write network stats when already loaded." into ics-mr1
* commit '7892cbffbeffb6e73f4c88e9965064b3985971c2':
  Only write network stats when already loaded.
2011-11-17 15:12:45 -08:00
Nick Kralevich
6967cbc959 Rename EntropyService to EntropyMixer
EntropyService implies that this program provides entropy to other
programs, and is misleading. The EntropyMixer class is designed purely
to stir the existing entropy pool with some possibily random-ish data,
and carryover entropy across device reboots.

Change-Id: I086cd339a3b652d32371521e61e1b1f555ce2280
2011-11-17 13:29:58 -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
ee737d9e44 am 66b570c7: am b9df01d3: Merge "Update NTP outside locks, log large trim events." into ics-mr1
* commit '66b570c70471976cd2a99825898c778a7850f2c8':
  Update NTP outside locks, log large trim events.
2011-11-17 11:46:26 -08:00
Daniel Sandler
f27e94ce9d am 7fd3ba91: am d5decdcc: Merge "Disable desk dock apps." into ics-mr1
* commit '7fd3ba9149affe68f8e21c88d3eceb4514cf2f6f':
  Disable desk dock apps.
2011-11-17 11:46:21 -08:00
satok
8bc972a5a4 am 9e502e90: am e5febfd5: Merge "Clean up the spell checker framework" into ics-mr1
* commit '9e502e90b58b4d0bbb792ef1c40dcfd9b9322ce8':
  Clean up the spell checker framework
2011-11-17 07:48:17 -08:00
Dianne Hackborn
7cd2b19a92 am 65952ec4: am 4c6a65bc: Merge "Maybe fix issue #5627399: java.lang.RuntimeException - While sign in..." into ics-mr1
* commit '65952ec4dc0e1703eb87a54c252953c53d07affc':
  Maybe fix issue #5627399: java.lang.RuntimeException - While sign in...
2011-11-17 05:46:32 -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
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
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
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
8e56e1f345 am cbcf8259: am cdec187a: Merge "Whoops, need to acquire lock." into ics-mr1
* commit 'cbcf8259697d2cb9025657a88e01cbb84be11d70':
  Whoops, need to acquire lock.
2011-11-15 19:43:32 -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
9864e0d81f am d9070a08: am 5f11d73c: Merge "Improve low memory dropbox reporting." into ics-mr1
* commit 'd9070a08807ee119d9d73052cc1ad1f1b29eb13d':
  Improve low memory dropbox reporting.
2011-11-15 14:44:54 -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
489ab1167b am 729a9afe: am 4b7494e0: Merge "Updating recent apps visuals on tablet" into ics-mr1
* commit '729a9afe44c21cbe4e10ca4d6ba400641cc75cbc':
  Updating recent apps visuals on tablet
2011-11-15 11:30:36 -08:00
Jeff Sharkey
5898991075 am bc03c74c: am d968670d: Merge "Conservatively trim data usage stats." into ics-mr1
* commit 'bc03c74c485669695805944a655795a6f9890956':
  Conservatively trim data usage stats.
2011-11-15 11:30:34 -08:00
Dianne Hackborn
356b9b87cf am f1c78890: am 91c2b5ce: Merge "Improve low memory reporting." into ics-mr1
* commit 'f1c78890dc703f44227b556e71624bed7eef95a1':
  Improve low memory reporting.
2011-11-15 11:30:01 -08:00
Dianne Hackborn
aaba252903 am 74710e50: am f10a5364: Merge "Maybe fix issue #5405788: Device continuously opening and closing..." into ics-mr1
* commit '74710e5041045251c43ff408641ec6818d23f985':
  Maybe fix issue #5405788: Device continuously opening and closing...
2011-11-15 11:29:57 -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
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
1093c9acc5 am 7ddf38a5: am be70785f: Make activity manager more robust in the face of app activity leaks.
* commit '7ddf38a5bf833f90057b0795dd9af6c61d3cf2d5':
  Make activity manager more robust in the face of app activity leaks.
2011-11-11 16:16:31 -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
7a8e78f4d3 am 3100e2b0: am 24597eb7: Merge "Tone down Tethering logs." into ics-mr1
* commit '3100e2b01792e6868698e06ecf275f47f187d537':
  Tone down Tethering logs.
2011-11-11 14:41:18 -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
41904b1e58 am 2c41bce3: am 424781e2: Fix NPE in ConnectivityService.
* commit '2c41bce3f2134159ce64d589ff1bb298b9939178':
  Fix NPE in ConnectivityService.
2011-11-11 11:51:16 -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
Akwasi Boateng
1333742bed am cb0db030: Merge branch \'ics-mr1-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp
* commit 'cb0db0306b5849a35d3d99eea1b34ce019c6f0d8':
  Make the overridden ImageView#setVisibility remotable
  Clamp non-monotonic stats instead of dropping.
  DO NOT MERGE. Fix leak in LayoutTransition
  Fix lastVisible/global rects
  Fix Wimax-less build.
  Fix leak in LayoutTransition
  Deferring wallpaper update to improve workspace scrolling (issue 5506959)
  Terminate EGL when an app goes in the background
  boot animation is dithered and scaled
  Fix NdefRecord byte-stream constructor.
  PopupWindow dismiss() can get into a recursive loop.
  Fold WiMAX state into the mobile RSSI.
  Remove dedicated wimax icon to fix RSSI layout.
2011-11-11 15:34:19 +00: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
Dianne Hackborn
f16cb9e510 am 8eac3b2f: am 0f70e482: Merge "Fix issue #5470311: Activity with android:configChanges defined..." into ics-mr1
* commit '8eac3b2f1ae4b155bd159317e9f221223189ba26':
  Fix issue #5470311: Activity with android:configChanges defined...
2011-11-10 22:17:08 +00:00
Dianne Hackborn
0f70e482c8 Merge "Fix issue #5470311: Activity with android:configChanges defined..." into ics-mr1 2011-11-10 14:12:25 -08:00
Chet Haase
f458b3d39a am 68a15583: am 41ffab86: Merge "increase the rate at which we dispatch events." into ics-mr1
* commit '68a15583f7438c687e3b029f83cf80ca7827ff31':
  increase the rate at which we dispatch events.
2011-11-10 21:49:30 +00:00
Chet Haase
41ffab86d9 Merge "increase the rate at which we dispatch events." into ics-mr1 2011-11-10 13:44:34 -08:00
Kenny Root
0d1569c359 am f4db2fe5: am bc853c03: Merge "Close file on exception as well" into ics-mr1
* commit 'f4db2fe56479635f8ec0a195e9e6b53a55216139':
  Close file on exception as well
2011-11-10 21:23:24 +00:00
Dianne Hackborn
56b53b597f Fix issue #5470311: Activity with android:configChanges defined...
...should not be restarted when rotating screen on xoom

This was a side-effect of a previous fix to compute the screen layout
config class based on the actual space available to the application, not
the raw display size.  On a device like Xoom, the system bar causes us
to switch between LONG and NOTLONG depending on whether the system bar
is on the short or long side of the screen.

To fix this, we now compute the screen layout class the same way
"smallest width" is computed: looking at all of the possible rotations
and using the smallest of them all.  In addition to preventing the device
from toggling between long and notlong on a Xoom-like screen, this will
also avoid other possible undersireable behavior like changing screen
layout size when rotating.

This does mean that Xoom is no longer considered a long screen even when
in landscape, because it is not a long screen in portrait.

Change-Id: I85f90a16294ef5a7de94d5b9231abbc6f914fe90
2011-11-10 11:19:57 -08:00
satok
c95b7412c2 am 3628dafe: am 34bd5969: Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1
* commit '3628dafe22aeeb2fca09b49d82c8d7289baf68ad':
  Respect user settings for spell checking language if explicitly set
2011-11-10 18:34:45 +00:00