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
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
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
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
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
Jeff Sharkey
3f3115b277
Make policy data enabled flag static.
...
For devices with both CDMA and GSM stack, ConnectivityService only
connects with the GSM variant. Making this flag static communicates
the policy state between all DCT.
Bug: 5586935
Change-Id: Iff0384027303470dd382d5173558d2d091ce4bf6
2011-11-08 17:15:46 -08:00
Dianne Hackborn
3af8b88d03
Merge "Add drop box reports of low memory." into ics-mr1
2011-11-08 17:01:05 -08:00
Irfan Sheriff
59c73b92a9
Merge "Convert soft ap config store to state machine" into ics-mr1
2011-11-08 15:51:43 -08:00
Irfan Sheriff
9575a1bea1
Convert soft ap config store to state machine
...
- Create thread when needed
- asynchronous interaction with wifi state machine
Bug: 5587391
Change-Id: Ie6d01b5a6b398a3fa12c384920a473e242443131
2011-11-08 15:45:42 -08:00
Dianne Hackborn
e4d4fbc8c0
Add drop box reports of low memory.
...
We are tagging these as "watchdog" to make them visible in the
reporting tools.
Also new am command to kill all background processes, mostly to make
it easier to test this stuff.
Change-Id: Ib9dc4747cd8bd44156fdf11d6a087cd4272203eb
2011-11-08 15:44:34 -08:00
Jeff Brown
1a69318266
Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK.
...
Bug: 5569662
Change-Id: Ib8cb9fb68a1a2d3520f34f7fbf6f002dfb91809d
2011-11-08 14:45:59 -08:00
Mike Lockwood
5e99dbc85c
Merge "Add support for disabling wallpaper service" into ics-aah
2011-11-08 14:13:27 -08:00
Jeff Sharkey
38ddeaa67e
Avoid inconsistent state when remove fails.
...
Bug: 5433432
Change-Id: Ia388fda006cbda09b5947fc61cec6353f75a3805
2011-11-08 13:04:22 -08:00
Robert Greenwalt
a74ebb6d08
am 604019c8: Merge "Fix build." into ics-mr1
...
* commit '604019c8d45b8c56cf48b03dbd92cfbdd29c48c1':
Fix build.
2011-11-08 18:33:20 +00:00
Robert Greenwalt
604019c8d4
Merge "Fix build." into ics-mr1
2011-11-08 10:31:37 -08:00
Robert Greenwalt
b45a317b56
am ea54b760: Merge "Wimax : wimax framework related open source." into ics-mr1
...
* commit 'ea54b7608584bc0535c9e89417778c3e95b50975':
Wimax : wimax framework related open source.
2011-11-08 18:28:16 +00:00
Robert Greenwalt
8588e47358
Fix build.
...
Missed a commit that fixed some issues.
bug:5237167
Change-Id: I61e44831e2c3f1cf613ca1387aa95d712b7d2ded
2011-11-08 10:12:25 -08:00
Robert Greenwalt
ea54b76085
Merge "Wimax : wimax framework related open source." into ics-mr1
2011-11-08 10:01:07 -08:00
Mathias Agopian
160b07cf0a
am 7f1c94e1: Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1
...
* commit '7f1c94e198e051bf481fd2d286c7b33d00664f9d':
Fix rotation displays frame N-1 briefly while rotating
2011-11-08 05:35:37 +00:00
Mathias Agopian
7f1c94e198
Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1
2011-11-07 21:33:53 -08:00
Robert Greenwalt
e8df648807
am 2d9ccdb4: am b445362b: Make upstream tether list threadsafe
...
* commit '2d9ccdb4abd393375c5ae99445afbb8b0855d25c':
Make upstream tether list threadsafe
2011-11-07 23:38:39 +00:00
Robert Greenwalt
2d9ccdb4ab
am b445362b: Make upstream tether list threadsafe
...
* commit 'b445362bd67cf596cfdd39db2dbe8f42cf9a119a':
Make upstream tether list threadsafe
2011-11-07 23:36:28 +00:00
tk.mun
148c7d0de7
Wimax : wimax framework related open source.
...
Integrate wimax network related changes into Android Framework.
- In Connectivity service, start wimax service.
- 4G icon display in StatusBarPolicy.
- DHCP renew add.
- Add radio for wiamx
Change-Id: I2d9012247edfdf49d71ca7e1414afd0006f330ca
Signed-off-by: tk.mun <tk.mun@samsung.com >
bug:5237167
2011-11-07 14:47:40 -08:00
Robert Greenwalt
b445362bd6
Make upstream tether list threadsafe
...
Outsiders asking for this list may cause the list to change on another thread.
Fixing general synchronization issues.
bug:5531630
Change-Id: I7a3ee0bba3db40f45bcb0159491942fa4cf38c37
2011-11-07 14:44:48 -08:00
Daniel Sandler
795f1bf4c4
am 010bb273: Merge changes I0da0f04f,I93197665 into ics-mr1
...
* commit '010bb273a58444f907bb82f62f8d7274f9637b49':
Offer the user an option to launch Dreams when docked.
Teach UiModeMgr about high-end and low-end desk docks.
2011-11-07 18:13:20 +00:00
Daniel Sandler
010bb273a5
Merge changes I0da0f04f,I93197665 into ics-mr1
...
* changes:
Offer the user an option to launch Dreams when docked.
Teach UiModeMgr about high-end and low-end desk docks.
2011-11-07 10:11:52 -08:00
Dianne Hackborn
23d1092a75
am 6581043a: am 7311bd4b: Merge "Print out memory info when we get into a low memory situation." into ics-mr0
...
* commit '6581043a44ab46a47f09080eeb7c9fc9d0a2d0c0':
Print out memory info when we get into a low memory situation.
2011-11-05 07:36:22 +00:00
Dianne Hackborn
6581043a44
am 7311bd4b: Merge "Print out memory info when we get into a low memory situation." into ics-mr0
...
* commit '7311bd4b709750384b058d8e988e2e983c97b3f2':
Print out memory info when we get into a low memory situation.
2011-11-05 07:34:03 +00:00
Dianne Hackborn
7311bd4b70
Merge "Print out memory info when we get into a low memory situation." into ics-mr0
2011-11-05 00:31:17 -07:00
Dianne Hackborn
04d6db380f
Print out memory info when we get into a low memory situation.
...
Change-Id: I2c8b8847a0f38135d8bf9ff9b7198517c3b0262e
2011-11-04 20:07:24 -07:00
Mathias Agopian
308b327fb6
am 3f24589e: Merge "workaround to set the WM refresh rate to 48 Hz for tuna devices only" into ics-mr1
...
* commit '3f24589edd860618ccf65d6653b002d13810e78b':
workaround to set the WM refresh rate to 48 Hz for tuna devices only
2011-11-05 03:00:13 +00:00
Mathias Agopian
222357f33a
workaround to set the WM refresh rate to 48 Hz for tuna devices only
...
this is TEMPORARY until we can do this properly.
Bug: 5572464
Change-Id: I6537706d636a83a4a50e2900d6b829dd89b6f245
2011-11-04 18:46:11 -07:00
Robert Greenwalt
796ef0d0e1
am fd900f05: am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
...
* commit 'fd900f05fb67046b97701f20626f7fd408fd8990':
Start using IP tool for advanced routing.
2011-11-04 22:57:48 +00:00
Robert Greenwalt
fd900f05fb
am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
...
* commit '348297abc0e03fb87a1d22465020b580d83fdd61':
Start using IP tool for advanced routing.
2011-11-04 22:55:30 +00:00
Robert Greenwalt
348297abc0
Merge "Start using IP tool for advanced routing." into ics-mr0
2011-11-04 15:53:37 -07:00
Mathias Agopian
e65beaabe4
Fix rotation displays frame N-1 briefly while rotating
...
The ScreenShot layer is now created hidden. The screenshot itself
is aquired during the transaction when the layer is made visible.
This guarantees the screenshot and the layer happen atomically
with respect to screen updates.
Bug: 5534521
Change-Id: Ida23e1f13d5716ec83b78a15712e0646d6cf8729
2011-11-04 15:15:32 -07:00
Dave Burke
a243a6befe
am a3af4c94: am 3ee47188: Frame rate to 48 fps
...
* commit 'a3af4c94dfbf3336004a38011f6453bfcd7fd638':
Frame rate to 48 fps
2011-11-04 20:58:48 +00:00
Dave Burke
a3af4c94df
am 3ee47188: Frame rate to 48 fps
...
* commit '3ee471889b09d90affddd00c409a515a64b6861b':
Frame rate to 48 fps
2011-11-04 20:55:30 +00:00