Irfan Sheriff
869fa653e0
resolved conflicts for merge of 52556689 to gingerbread-plus-aosp
...
Change-Id: I61ed41f03b635ee760dc4c9d01935ac9fac9703a
2010-12-01 10:40:05 -08:00
Irfan Sheriff
525566893b
Merge "DO NOT MERGE Fix status fetch from supplicant" into gingerbread
2010-12-01 10:17:56 -08:00
Irfan Sheriff
f38b709e47
am af2d3c7c: Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread
...
* commit 'af2d3c7ccebb009f31a92c1a87b0925a2891e1c4':
DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver
2010-12-01 09:53:17 -08:00
Irfan Sheriff
e142eb0c24
DO NOT MERGE Fix status fetch from supplicant
...
Bug: 3192891
Change-Id: I2471f144494d398fe1d4572ac4d6421c100693e2
2010-12-01 09:52:32 -08:00
Irfan Sheriff
af2d3c7cce
Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread
2010-12-01 09:51:27 -08:00
Brad Fitzpatrick
7e5cd79683
am 981a72a1: Merge "[don\'t auto-merge] Don\'t re-read SharedPreferences unnecessarily." into gingerbread
...
* commit '981a72a1506f7e6e42747b9aa0be2001795c6619':
[don't auto-merge] Don't re-read SharedPreferences unnecessarily.
2010-12-01 08:50:00 -08:00
Brad Fitzpatrick
981a72a150
Merge "[don't auto-merge] Don't re-read SharedPreferences unnecessarily." into gingerbread
2010-12-01 08:46:52 -08:00
Hung-ying Tyan
6034f9b266
am 06e8cdc0: Fix race between ending and answering a SIP call.
...
* commit '06e8cdc0f81ead604d5adf9d7b3f982e10226fd2':
Fix race between ending and answering a SIP call.
2010-11-30 23:21:40 -08:00
Hung-ying Tyan
06e8cdc0f8
Fix race between ending and answering a SIP call.
...
+ Also fix race between ending and changing (holding/unholding) a SIP call.
+ Remove an unused method.
Bug : 3128233
Change-Id: Ie18d8333a88f0d9906d54988243d909b58e07e4b
2010-12-01 15:02:36 +08:00
Hung-ying Tyan
ed34b244f1
am d7116ff1: Merge "Do not suppress error feedback during a SIP call." into gingerbread
...
* commit 'd7116ff1f0d1a3c14992273d0b899c3b71ba6d3f':
Do not suppress error feedback during a SIP call.
2010-11-30 22:55:37 -08:00
Hung-ying Tyan
d7116ff1f0
Merge "Do not suppress error feedback during a SIP call." into gingerbread
2010-11-30 22:53:26 -08:00
David Brown
4c11eee7ec
am 04639ba0: Reduce the outrageous verbosity of CallerInfo.toString().
...
* commit '04639ba0a939988d00131e61458807dac650f9c3':
Reduce the outrageous verbosity of CallerInfo.toString().
2010-11-30 18:11:21 -08:00
Irfan Sheriff
f92b453a58
DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver
...
The worksource reporting gets blocked by the
statetracker lock which can cause system restarts when
done from broadcastreceiver thread
Bug: 3153787
Change-Id: Ie70687e7453a1c3618bac1424562be44762b2c9d
2010-11-30 16:07:05 -08:00
Mathias Agopian
3248b484a2
am b483d5cd: fix [3237242] sensormanager sensor active count gets out of sync
...
* commit 'b483d5cd134cda393824fd8e9c1a5443bd868ae6':
fix [3237242] sensormanager sensor active count gets out of sync
2010-11-30 15:51:00 -08:00
David Brown
04639ba0a9
Reduce the outrageous verbosity of CallerInfo.toString().
...
Bug: 3121292
Change-Id: Ia8383891ef29a003acbd627b25ce87a187ef95c0
2010-11-30 15:49:48 -08:00
Mathias Agopian
be0ece6f85
am 186b68b7: Merge "allow rotation-vector to have 4 components" into gingerbread
...
* commit '186b68b74417e8ef73f2083769166e7785df6c30':
allow rotation-vector to have 4 components
2010-11-30 15:41:41 -08:00
Mathias Agopian
b483d5cd13
fix [3237242] sensormanager sensor active count gets out of sync
...
whether a physical sensor needed to be active or not was managed by
a simpe reference counter; unfortunatelly nothing prevented it to
get out of sync if a sensor was disabled more than once.
sensorservice already maintainted a list of all the "clients"
connected to a physical sensor; we now use that list to determine if
a sensor should be enabled. This can never be "out-of-sync" since
this is the only data structure linking a sensor to a user of that
sensor.
also removed the isEnabled() method, which was never used and
implemented wrongly (since it didn't take into account that a sensor
could be disabled for a client but not of another).
Change-Id: I789affb877728ca957e99f7ba749def37c4db1c7
2010-11-30 15:41:16 -08:00
Mathias Agopian
186b68b744
Merge "allow rotation-vector to have 4 components" into gingerbread
2010-11-30 15:38:38 -08:00
David Brown
b9c19be7c1
am 91abcb62: Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into gingerbread
...
* commit '91abcb624a6a873a2becbbf0f8186d6533daeb89':
Fix bug 3121292: Contact photo not shown correctly for SIP calls
2010-11-30 15:24:42 -08:00
David Brown
91abcb624a
Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into gingerbread
2010-11-30 15:20:45 -08:00
Andreas Huber
b460779cff
am 30c81844: Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into gingerbread
...
* commit '30c818444d876dd868b84adec2416308c90f32e3':
DO NOT MERGE Support for "chunked" HTTP transfer encoding.
2010-11-30 14:32:09 -08:00
Andreas Huber
30c818444d
Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into gingerbread
2010-11-30 14:30:00 -08:00
Mathias Agopian
4b7de2c8de
am 66cff624: Merge "Uses 4-th order low-pass for extracting gravity." into gingerbread
...
* commit '66cff624e9abd23da05ddc20698eb3e7d0fb5a17':
Uses 4-th order low-pass for extracting gravity.
2010-11-30 14:18:05 -08:00
Mathias Agopian
66cff624e9
Merge "Uses 4-th order low-pass for extracting gravity." into gingerbread
2010-11-30 14:15:23 -08:00
Andreas Huber
9157478dcf
am a41c1e1d: Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback." into gingerbread
...
* commit 'a41c1e1de0d5fac57842ffe73e0a4f575fcc73fb':
DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback.
2010-11-30 14:08:56 -08:00
Mathias Agopian
6038db3dda
Uses 4-th order low-pass for extracting gravity.
...
Most accelerometers have 8-bits accuracy so we beed to
reject 48dB in thestop-band, which requires a 4-th order
filter at the cut-off frequency we're using.
Change-Id: Ic00421d38d751641f86b1f3ad7663e6b44a91198
2010-11-30 14:07:28 -08:00
Mathias Agopian
7badd2c402
allow rotation-vector to have 4 components
...
- upadte documentation for rotation vector
- update method dealing with rotation vector to deal with 4 components
- virtual rotation-vector sensor reports all four components
- improve SensorManager documentation layout
Whent he 4-th component of the rotation-vector is present, we can save
a square-root when computing the quaternion or rotation matrix from it.
Change-Id: Ia84d278dd5f0909fab1c5ba050f8df2679e2c7c8
2010-11-30 14:07:09 -08:00
Andreas Huber
a41c1e1de0
Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback." into gingerbread
2010-11-30 14:06:26 -08:00
Mathias Agopian
e3895b6ff2
am 24754c9f: Merge "don\'t attempt to normalize the rotation vector" into gingerbread
...
* commit '24754c9f94b1bd8b176456da82a6059b2e8ded0f':
don't attempt to normalize the rotation vector
2010-11-30 14:05:44 -08:00
Mathias Agopian
24754c9f94
Merge "don't attempt to normalize the rotation vector" into gingerbread
2010-11-30 14:03:43 -08:00
Robert Ly
7fac762d1b
am d06010c3: Merge "Doc change: updating ndk download and overview page" into gingerbread
...
* commit 'd06010c3735332e4e4a090a82fd70695625bc875':
Doc change: updating ndk download and overview page
2010-11-30 13:53:41 -08:00
Robert Ly
d06010c373
Merge "Doc change: updating ndk download and overview page" into gingerbread
2010-11-30 13:51:05 -08:00
Andreas Huber
d208a2c7b0
DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback.
...
DO NOT MERGE
related-to-bug: 3141937
Change-Id: Iaf1b0c5d45a6b5bb7624a59747041c27b4dde83b
2010-11-30 13:42:50 -08:00
Andreas Huber
8d023ddcd4
DO NOT MERGE Support for "chunked" HTTP transfer encoding.
...
DO NOT MERGE
Change-Id: I253d48ea69f239a6d3d0bb7e0d31eef5c773a9d6
related-to-bug: 3205131
2010-11-30 13:37:01 -08:00
Scott Main
2eaa846ed3
am 54d21dad: docs: updates to the backup dev guide add sample code for performing restore and fix typos bug: 3180881,3125550,3125563
...
* commit '54d21dadf1aee8f58df65728a00ad57dbfeefb22':
docs: updates to the backup dev guide add sample code for performing restore and fix typos bug: 3180881,3125550,3125563
2010-11-30 13:30:33 -08:00
Scott Main
54d21dadf1
docs: updates to the backup dev guide
...
add sample code for performing restore and fix typos
bug: 3180881,3125550,3125563
Change-Id: I27dd19ede8bad03d11b8ddebe516e9dbf4fdbb89
2010-11-30 13:27:10 -08:00
Andreas Huber
aeaa3b3c6a
am 567b2bd1: Merge "After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user." into gingerbread
...
* commit '567b2bd1469b1c37e6249637d313253b7d84971e':
After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.
2010-11-30 13:07:56 -08:00
Andreas Huber
567b2bd146
Merge "After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user." into gingerbread
2010-11-30 13:00:14 -08:00
Brad Fitzpatrick
d2bbaaf294
[don't auto-merge] Don't re-read SharedPreferences unnecessarily.
...
Bug: 3211034
Bug: 3216290
Change-Id: Idd5cc25965d400f20122372ca1cf47d4703dd87c
2010-11-30 12:59:28 -08:00
Eric Laurent
371ed72216
am 688f4c58: Merge "Update java doc for visualizer FFT capture." into gingerbread
...
* commit '688f4c58d4a7590ad47c219af3a5b8479d3a084d':
Update java doc for visualizer FFT capture.
2010-11-30 11:56:00 -08:00
Andreas Huber
3a2dc0d573
am b690e55d: Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread
...
* commit 'b690e55d3f713d68c6ed9654a05a5370bda731d5':
DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.
2010-11-30 11:53:01 -08:00
Eric Laurent
688f4c58d4
Merge "Update java doc for visualizer FFT capture." into gingerbread
2010-11-30 11:50:25 -08:00
Robert Ly
0829ab1577
Doc change: updating ndk download and overview page
...
Change-Id: Icbd578958d7a20c19f60827988a8893785b40851
2010-11-30 11:49:52 -08:00
Dirk Dougherty
fb9612ba98
am 04d2cc05: Merge "Do not merge: Doc change: API diff report for gingerbread." into gingerbread
...
* commit '04d2cc05a2a59bf61bead85d58bc4c186392d91d':
Do not merge: Doc change: API diff report for gingerbread.
2010-11-30 11:48:51 -08:00
Dirk Dougherty
ba5d11bdba
am 50f8445e: Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform.
...
* commit '50f8445edd14a21ad86080ff7b204eefdc2c62d5':
Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform.
2010-11-30 11:48:46 -08:00
Eric Fischer
30a0e0db71
am 3e6fb5d6: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '3e6fb5d66eed34c91b9b056ad2d4c317186476fd':
Import revised translations. DO NOT MERGE
2010-11-30 11:48:00 -08:00
Andreas Huber
0fb258d6c3
After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.
...
Change-Id: Ifb1f8c91e95a5cafe30ae1035973316c210b98a5
related-to-bug: 3152363
2010-11-30 11:46:38 -08:00
Wink Saville
2ebb3a2d9b
am f3166799: Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread
...
* commit 'f316679971be356dbb01f991e95742bc5f2a8383':
Fix GSM permanent failure handling, DO NOT MERGE.
2010-11-30 11:46:34 -08:00
Ben Murdoch
d2607118ed
am 27e728f2: Merge "Hide plugin views when we start playing HTML5 video" into gingerbread
...
* commit '27e728f22d954caa7252be6c19a67a9277e1db3b':
Hide plugin views when we start playing HTML5 video
2010-11-30 11:46:24 -08:00
Hung-ying Tyan
c41b27e274
am 349f3509: Merge "Correct SipService.isOpened() implementation." into gingerbread
...
* commit '349f3509f7335bbdef443a75afa36fb3c2d9552c':
Correct SipService.isOpened() implementation.
2010-11-30 11:46:15 -08:00