Commit Graph

8994 Commits

Author SHA1 Message Date
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
e5249ecbf4 am 0f70e482: Merge "Fix issue #5470311: Activity with android:configChanges defined..." into ics-mr1
* commit '0f70e482c8aa7ce9c5676b1226ff98b63fb991e7':
  Fix issue #5470311: Activity with android:configChanges defined...
2011-11-10 22:49:02 +00:00
Chet Haase
42d4fea25c am 41ffab86: Merge "increase the rate at which we dispatch events." into ics-mr1
* commit '41ffab86d92622679d4d2ad8307806e8099f8170':
  increase the rate at which we dispatch events.
2011-11-10 22:48:54 +00:00
Kenny Root
a6a3a6f949 am bc853c03: Merge "Close file on exception as well" into ics-mr1
* commit 'bc853c0344b2bbe6f94f425cd0fb1d2642c0fa2f':
  Close file on exception as well
2011-11-10 22:48:50 +00: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
Kenny Root
62539e9efa Close file on exception as well
Bug: 5458045
Change-Id: I4c79b9c273ff69dda292e5cc7b2b60f8db2edbd9
2011-11-10 09:40:53 -08:00
Chet Haase
532147b308 increase the rate at which we dispatch events.
Previously, the input dispatch rate was capped by default to 55.
This worked fine for systems with a refresh rate of 55 or lower. But on
devices with a higher frame rate (such as stingray at 60 fps), we do not
receive events as fast as the rendering system wants to redraw the frames, so
we would occasionally miss events between frames, resulting in a visual
stutter during drag operations where the dragged object would essentially
stay still for a frame.

This fix increases the default rate to 90, or 1.5 times the highest typical
refresh rate of our devices.

Change-Id: Id8622185b3da93f9f6505157d2e6f3f33e36bd04
2011-11-10 07:55:47 -08:00
satok
acf8357f30 am 34bd5969: Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1
* commit '34bd596935ccd4574dbf6c6e7bfa24323e3e8e1f':
  Respect user settings for spell checking language if explicitly set
2011-11-10 02:44:03 +00:00
satok
05f2470061 Respect user settings for spell checking language if explicitly set
Bug: 5554116
Change-Id: I8c16d732af1fe713d30d97dfe829ff16653c7f34
2011-11-10 07:54:52 +09:00
Jeff Sharkey
5cc8b1f0fd am 33e3710a: am 630a13bd: Merge "Bootstrap stats before registering listeners." into ics-mr1
* commit '33e3710aafb68125f05ab30d61e324c894f0a3bb':
  Bootstrap stats before registering listeners.
2011-11-09 21:51:40 +00:00
Jeff Sharkey
c592a57f3f am 489b4312: am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1
* commit '489b431273500db81d35ed43440915187c238f92':
  Make operation counts monotonically increase.
2011-11-09 21:51:38 +00:00
Jeff Sharkey
e94d9e1e42 am 028fe5a7: am 2048789c: Merge "Dispatch alerts through background thread." into ics-mr1
* commit '028fe5a715d8f9d78154e482dc46b27f97f94e53':
  Dispatch alerts through background thread.
2011-11-09 21:51:37 +00:00
Jeff Sharkey
629cb84fda am cef1300e: am f3882914: Merge "Make policy data enabled flag static." into ics-mr1
* commit 'cef1300ebd6bc88e93ee1420e5fec359531533d2':
  Make policy data enabled flag static.
2011-11-09 21:51:35 +00:00
Mathias Agopian
e55418beaf am a508f056: am e4a1bafb: Merge "decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes." into ics-mr1
* commit 'a508f056d0b5a439b9436604824739049fd25be6':
  decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes.
2011-11-09 21:51:32 +00:00
Jeff Sharkey
9aed14ef79 am 79c4ad17: am ccdeb428: Merge "Avoid inconsistent state when remove fails." into ics-mr1
* commit '79c4ad17f966d0ccf24d94fdcbc6d3f83e359604':
  Avoid inconsistent state when remove fails.
2011-11-09 21:51:26 +00:00
Jeff Brown
97c9e987ba am 0816b0c8: am bc0b010e: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1
* commit '0816b0c871ea93ffbcd3c60151d067dcfcebc1ac':
  Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662
2011-11-09 21:51:25 +00:00
Dianne Hackborn
6238667682 am 3b2681ba: am 3af8b88d: Merge "Add drop box reports of low memory." into ics-mr1
* commit '3b2681bad989013154f90c4b9c31f074af1f822c':
  Add drop box reports of low memory.
2011-11-09 21:51:21 +00:00
Irfan Sheriff
af139db574 am 1c9126c6: am 59c73b92: Merge "Convert soft ap config store to state machine" into ics-mr1
* commit '1c9126c64b56b6465fd551680461caed2e1ea20d':
  Convert soft ap config store to state machine
2011-11-09 21:51:12 +00:00
Robert Greenwalt
75f9808e55 am 604019c8: Merge "Fix build." into ics-mr1
* commit '604019c8d45b8c56cf48b03dbd92cfbdd29c48c1':
  Fix build.
2011-11-09 19:34:50 +00:00
Jeff Sharkey
ba83524338 am 630a13bd: Merge "Bootstrap stats before registering listeners." into ics-mr1
* commit '630a13bdd88723599a7617ca4df20ab923e7ffbb':
  Bootstrap stats before registering listeners.
2011-11-09 18:59:40 +00:00
Jeff Sharkey
3c865c0a51 am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1
* commit '4c48d2ff6937e1e3a2fb93cc4cc29324b20542a5':
  Make operation counts monotonically increase.
2011-11-09 18:59:38 +00:00
Jeff Sharkey
5d528576ef am 2048789c: Merge "Dispatch alerts through background thread." into ics-mr1
* commit '2048789c64d30b0d3c42c4df7e705f14b7295e10':
  Dispatch alerts through background thread.
2011-11-09 18:59:37 +00:00
Jeff Sharkey
dcb3b6ad57 am f3882914: Merge "Make policy data enabled flag static." into ics-mr1
* commit 'f3882914e668501ee1dabd42207ed18348050c14':
  Make policy data enabled flag static.
2011-11-09 18:59:35 +00:00
Mathias Agopian
21e3a16e34 am e4a1bafb: Merge "decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes." into ics-mr1
* commit 'e4a1bafba351a1b4cea18af3442412de03dd4d89':
  decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes.
2011-11-09 18:59:27 +00:00
Jeff Sharkey
ebf32009ce am ccdeb428: Merge "Avoid inconsistent state when remove fails." into ics-mr1
* commit 'ccdeb428ef541bab1bbc6ee3e33c4fb6ccbec42a':
  Avoid inconsistent state when remove fails.
2011-11-09 18:59:11 +00:00
Jeff Brown
6f551dd14a am bc0b010e: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1
* commit 'bc0b010ecc7254b0e2c7a0268e5242557579b471':
  Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662
2011-11-09 18:59:01 +00:00
Jason Simmons
efae3d24bd Merge "resolved conflicts for merge of 3af8b88d to ics-aah" into ics-aah 2011-11-09 10:57:19 -08:00
Mike Lockwood
43adbae803 Merge "NetworkTimeUpdateService: Schedule NTP on ethernet connect as well as wifi" into ics-aah 2011-11-09 10:55:26 -08:00
Mike Lockwood
0342a420a4 NetworkTimeUpdateService: Schedule NTP on ethernet connect as well as wifi
Change-Id: I936fd9a8119ee361ec0afde60f7931c58ffdd524
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-11-09 10:49:29 -08:00
Jason Simmons
f981686779 resolved conflicts for merge of 3af8b88d to ics-aah
Change-Id: I2b68cd7c904e68a16565b7274560e7105c643c87
2011-11-09 10:08:21 -08:00
Robert Greenwalt
c1b3cbe164 resolved conflicts for merge of ea54b760 to master
Change-Id: Ifcdfd6ffd82db1293936a8a3b5715dd767fb43f8
2011-11-09 09:03:59 -08:00
Irfan Sheriff
70b1999ad5 am 59c73b92: Merge "Convert soft ap config store to state machine" into ics-mr1
* commit '59c73b92a9ef8df5d4873bc36f05b776c3a476bc':
  Convert soft ap config store to state machine
2011-11-09 14:37:22 +00:00
Jeff Sharkey
630a13bdd8 Merge "Bootstrap stats before registering listeners." into ics-mr1 2011-11-08 23:43:58 -08:00
Jeff Sharkey
4c48d2ff69 Merge "Make operation counts monotonically increase." into ics-mr1 2011-11-08 23:43:38 -08:00
Jeff Sharkey
2048789c64 Merge "Dispatch alerts through background thread." into ics-mr1 2011-11-08 23:43:23 -08:00
Jeff Sharkey
f3882914e6 Merge "Make policy data enabled flag static." into ics-mr1 2011-11-08 23:43:12 -08:00
Jeff Sharkey
3359aca765 Bootstrap stats before registering listeners.
Also move ISE to handled NonMonotonicException.

Bug: 5570872
Change-Id: I793f349287ef5589185f117dfbec6f1fad73a661
2011-11-08 18:24:12 -08:00
Mathias Agopian
e4a1bafba3 Merge "decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes." into ics-mr1 2011-11-08 18:01:21 -08:00
Jeff Sharkey
7e25b0ea88 Dispatch alerts through background thread.
Bug: 5557659
Change-Id: Icc3ad476a98ec3430b33f915723ffcc36ccbfae7
2011-11-08 17:41:26 -08:00
Jeff Sharkey
4abb1b8ef6 Make operation counts monotonically increase.
Bug: 5585704
Change-Id: I5247a68acdb209a4ef0f5aac18944595c295e6ca
2011-11-08 17:35:28 -08:00
Jeff Sharkey
ccdeb428ef Merge "Avoid inconsistent state when remove fails." into ics-mr1 2011-11-08 17:27:03 -08:00
Jeff Brown
bc0b010ecc Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1 2011-11-08 17:22:06 -08:00
Mathias Agopian
47f1fe5285 decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes.
the intent here is to save power.

Change-Id: I6cc1cae865cc46551afcfcec9ca03faaa5b6936f
2011-11-08 17:19:55 -08:00