Robert Greenwalt
75f9808e55
am 604019c8: Merge "Fix build." into ics-mr1
...
* commit '604019c8d45b8c56cf48b03dbd92cfbdd29c48c1':
Fix build.
2011-11-09 19:34:50 +00:00
Robert Greenwalt
c1b3cbe164
resolved conflicts for merge of ea54b760 to master
...
Change-Id: Ifcdfd6ffd82db1293936a8a3b5715dd767fb43f8
2011-11-09 09:03:59 -08:00
Eric Laurent
2b7f91b932
Merge "Fix regression for SoundPool playback" into ics-mr1
2011-11-09 08:27:20 -08: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 Brown
a965f083d0
Delete dead code.
...
Change-Id: Ia78e338a363ab82f9c0b45ce324c2a7cfa8d8246
2011-11-08 20:24:21 -08:00
Eric Laurent
8a04fe032b
Fix regression for SoundPool playback
...
Commit 19ddf0eb introduced a problem with applications (like SoundPool)
relying on an underrun condition to detect end of playback instead of
stopping the track when all data is written.
AudioFlinger would keep waiting for new data in case of partial buffer
filling and never reach the underrun condition.
Added a mechanism to wait no more than once if not enough frames are present
in the track buffer.
Issue 5585490.
Change-Id: I131e605ff6070831a01ddf734e68459e3bf2354b
2011-11-08 18:42:37 -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
393e2c1f7a
Merge "SensorService now always clamps the requested rate" into ics-mr1
2011-11-08 17:20:59 -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
Mathias Agopian
95482b61c3
Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1
2011-11-08 15:55:55 -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
Jeff Sharkey
38ddeaa67e
Avoid inconsistent state when remove fails.
...
Bug: 5433432
Change-Id: Ia388fda006cbda09b5947fc61cec6353f75a3805
2011-11-08 13:04:22 -08:00
Robert Greenwalt
604019c8d4
Merge "Fix build." into ics-mr1
2011-11-08 10:31:37 -08: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
Eric Laurent
2cb5760896
am f3a892ab: Merge "AudioFlinger: mix track only when really ready" into ics-mr1
...
* commit 'f3a892ab9347ce733b81ccb4913a91c586f8f367':
AudioFlinger: mix track only when really ready
2011-11-08 16:37:11 +00:00
Eric Laurent
f3a892ab93
Merge "AudioFlinger: mix track only when really ready" into ics-mr1
2011-11-08 08:32:57 -08:00
Mathias Agopian
a06c06b9c0
Fix an issue where we could wait for a non-existing transaction
...
This fixes the issue:
"Call not sent" dialog takes too long to dismiss after hitting OK"
Note: the system would recover after a 5 second timeout.
Bug: 5534520
Change-Id: Ifa37e594b50581f498479a5858672441b3d7dd87
2011-11-07 21:58:03 -08:00
Mathias Agopian
147b601e99
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:36:46 +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
Mathias Agopian
eed2373321
SensorService now always clamps the requested rate
...
Requested rate will be clamped to the minimum rate and then
to 1ms. Previously we would return an error if a lower
rate was asked. The SensorManager documentation wording
allows this change.
We do this to get more consistancy between all the sensor
drivers / HALs
Change-Id: I199f76486fb76ccbb11e7280460a03726c767e84
2011-11-07 21:21:47 -08:00
Robert Greenwalt
46bb0a1cf6
am 2d9ccdb4: am b445362b: Make upstream tether list threadsafe
...
* commit '2d9ccdb4abd393375c5ae99445afbb8b0855d25c':
Make upstream tether list threadsafe
2011-11-07 23:41:20 +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
4f631bbf97
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:15:30 +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
973f8f20c4
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-07 15:51:38 +00:00
Mathias Agopian
9e079d8fa0
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-07 15:51:33 +00:00
Robert Greenwalt
08d153fb8e
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-05 19:33:46 +00:00
Dave Burke
4fa8f7f4ac
am a3af4c94: am 3ee47188: Frame rate to 48 fps
...
* commit 'a3af4c94dfbf3336004a38011f6453bfcd7fd638':
Frame rate to 48 fps
2011-11-05 19:33:33 +00:00
Mathias Agopian
5f43c96a71
am 515c6b44: Merge "fix an issue where SensorService could request an invalid sensor delay" into ics-mr1
...
* commit '515c6b44d57b829792267594a355cd2831582197':
fix an issue where SensorService could request an invalid sensor delay
2011-11-05 19:33:18 +00:00
Irfan Sheriff
a4e1014d36
am 45a04db3: Merge "Avoid quick shutdown after a driver start" into ics-mr1
...
* commit '45a04db3f95755829b24043d30d7da7182b4f33b':
Avoid quick shutdown after a driver start
2011-11-05 19:33:16 +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
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