Jean-Baptiste Queru
1a2344b8b2
am 09e50cdb: Merge "Reorder lock acquision vs try."
...
* commit '09e50cdbc62938b178f4c9a66b3cec8a466daaa8':
Reorder lock acquision vs try.
2010-11-17 17:16:06 -08:00
Jean-Baptiste Queru
09e50cdbc6
Merge "Reorder lock acquision vs try."
2010-11-17 17:03:10 -08:00
Jean-Baptiste Queru
7ee427714d
Merge "resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp" into gingerbread-plus-aosp
2010-11-17 16:52:56 -08:00
Jean-Baptiste Queru
f4072fcc14
resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp
...
Change-Id: I938c0a66ad4271b33626d6b12406a2f6c6d1b6d8
2010-11-17 16:47:59 -08:00
Dirk Dougherty
31c5f68d8f
am fc1f5e24: doc change: update uses-feature for gingerbread.
...
* commit 'fc1f5e24bcd678a08221c8c01a364807edca6daf':
doc change: update uses-feature for gingerbread.
2010-11-17 16:20:59 -08:00
Dirk Dougherty
fc1f5e24bc
doc change: update uses-feature for gingerbread.
...
Change-Id: I1af174da527a91e111d6bdecaad8c08bde050c24
2010-11-17 16:15:52 -08:00
Jean-Baptiste Queru
8fc378f9f5
Merge "Added buildQuery and buildUnionSubQuery methods without misleading selectionArgs parameter."
2010-11-17 15:10:05 -08:00
Dianne Hackborn
d28dc3cf77
am 05434e9f: Final API 9. Really! Honestly! I hope.
...
* commit '05434e9fa7a6ec844611bbd154c4a3eceafec538':
Final API 9. Really! Honestly! I hope.
2010-11-16 17:49:07 -08:00
Dianne Hackborn
05434e9fa7
Final API 9. Really! Honestly! I hope.
...
Change-Id: I2ee5844587b5745556d621e4b9ef0efa3ec5edcf
2010-11-16 15:40:56 -08:00
Brad Fitzpatrick
8443dd16c2
am 383e95e2: Merge "DropBox: Read until the end of stream has been reached"
...
* commit '383e95e245ceb87a2a6ad6422404ce641f0e08eb':
DropBox: Read until the end of stream has been reached
2010-11-16 09:37:56 -08:00
Brad Fitzpatrick
383e95e245
Merge "DropBox: Read until the end of stream has been reached"
2010-11-16 09:22:31 -08:00
Xia Wang
f55c973637
am d0a8f54a: Merge "Add Wi-Fi connection functional tests." into gingerbread
...
* commit 'd0a8f54a5bcd6a10eaaa88d888c3cbb83869532c':
Add Wi-Fi connection functional tests.
2010-11-16 09:16:54 -08:00
Xia Wang
d0a8f54a5b
Merge "Add Wi-Fi connection functional tests." into gingerbread
2010-11-16 09:14:46 -08:00
Christian Lindeberg
e9f1881521
DropBox: Read until the end of stream has been reached
...
Read the requested length or until the end of the input stream
has actually been reached.
Change-Id: I01bc0b81eca0225209bdd288dde6a778a19d1e2c
2010-11-16 09:57:54 +01:00
Xia Wang
ca1f2b1a1e
Add Wi-Fi connection functional tests.
...
- Add a XML parser to parse Wi-Fi configurations
- Add Wifi connection tests
- Fix issue: failure in setup will block the next tests.
call tearDown() if the test fails at setUp().
Change-Id: I1a380fa02ebc96b69165d1514da12df985224e8d
2010-11-15 15:10:44 -08:00
Mathias Agopian
f11bf284d3
am 305bc0fe: Merge "Fix a race condition in sensormanager" into gingerbread
...
* commit '305bc0fe977f6197bfae847dbaf58916cf8980ba':
Fix a race condition in sensormanager
2010-11-15 13:19:46 -08:00
Mathias Agopian
99866c111b
am 9e291a4b: Merge "Revert "allow all 4 orientations"" into gingerbread
...
* commit '9e291a4b9922719165145434217e100e2118860d':
Revert "allow all 4 orientations"
2010-11-15 13:19:43 -08:00
Mathias Agopian
305bc0fe97
Merge "Fix a race condition in sensormanager" into gingerbread
2010-11-15 13:14:59 -08:00
Mathias Agopian
9e291a4b99
Merge "Revert "allow all 4 orientations"" into gingerbread
2010-11-15 13:14:50 -08:00
Justin Ho
b9d3e35907
am 868889fb: Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread
...
* commit '868889fb4175979ef9aa505fc746bf616f54ed10':
DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware.
2010-11-15 09:13:16 -08:00
Justin Ho
868889fb41
Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware." into gingerbread
2010-11-15 09:10:33 -08:00
Justin Ho
ee6aa806d8
DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at highest volume setting by adjusting gain. Proper fix should be via media stack/hardware.
...
Change-Id: I6220c0b9f85b20c690437a23c364ad4898b8e16a
2010-11-15 09:07:34 -08:00
Justin Ho
dc04f53703
am a5c4aeba: Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread
...
* commit 'a5c4aeba1cb53775bdb5622569ffe53641f4728d':
DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)
2010-11-15 08:53:56 -08:00
Justin Ho
a5c4aeba1c
Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread
2010-11-15 08:50:19 -08:00
Justin Ho
1b35a52263
DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)
...
Change-Id: I5c7fc73f28408e6345bb9a73f0fe10014a26efbf
2010-11-15 08:41:16 -08:00
Mathias Agopian
f33a6e9645
Fix a race condition in sensormanager
...
the per-connection state assumed the main sensorservice
lock was held during access. This is however not true while
pre-processing the events just before sending them to clients.
Therefore, there was a small window during which this state
could be modified while being used.
we now have an internal lock that protects this state.
Change-Id: I594680f20f09d6a4f1f38f093a1d3f650dcef1be
2010-11-14 20:55:25 -08:00
Mathias Agopian
f9ce879e5c
Revert "allow all 4 orientations"
...
This reverts commit 1d8d0159e72556ea20aba325fb27d8470282e1ba.
Change-Id: Iffd8cbad98ff7e498032df1d226f4fbc7cde95b1
2010-11-13 22:02:13 -08:00
Megha Joshi
7bcccece88
am e2ef2c10: Fixing build (DO NOT MERGE)
...
* commit 'e2ef2c10e76a4648a27ce4c392eb7b9b3589b9f7':
Fixing build (DO NOT MERGE)
2010-11-12 19:13:35 -08:00
Megha Joshi
e2ef2c10e7
Fixing build (DO NOT MERGE)
...
Change-Id: I27fb9dc0584940e119b030d63ff5781ef19001c1
2010-11-12 19:09:11 -08:00
Megha Joshi
7e05971692
am 48c698fc: Adding NFC sample resources (DO NOT MERGE)
...
* commit '48c698fc1497a01743f9ce5ab6fb8f6700847259':
Adding NFC sample resources (DO NOT MERGE)
2010-11-12 18:46:38 -08:00
Megha Joshi
48c698fc14
Adding NFC sample resources (DO NOT MERGE)
...
Change-Id: I687d07ebe4f8bd0c5dec30e69af0d3e880a68230
2010-11-12 18:35:49 -08:00
Jonas Schwertfeger
8402903723
Added buildQuery and buildUnionSubQuery methods without misleading selectionArgs parameter.
...
The signatures of the existing buildQuery and buildUnionSubQuery methods include a selectionArgs
parameter that is not actually being used in the method implementations. This parameter leads
to the misconception that SQL paramter substitution is carried out by these methods. I added
new variants of these methods without that parameter and deprecated the old variants.
Change-Id: I1bf770d5c777649e9aac36d93aa93bd65bbcc2a3
2010-11-12 12:18:37 +01:00
Scott Main
16555c60f7
am d6b9d078: Merge "docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;" into gingerbread
...
* commit 'd6b9d078ecf1b4d7cc57375830cf2ce390fc893c':
docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;
2010-11-11 17:02:54 -08:00
Scott Main
d6b9d078ec
Merge "docs: misc changes to sdk setup docs update sdk manager screenshot; update info about new manager UI; more info about the windows installer;" into gingerbread
2010-11-11 16:56:19 -08:00
Eric Fischer
9acf04ab6a
am 3082e5fe: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '3082e5fed04c42301c89de8df36e9d62f0937dec':
Import revised translations. DO NOT MERGE
2010-11-11 15:49:03 -08:00
Eric Fischer
3082e5fed0
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-11-11 15:44:04 -08:00
Mathias Agopian
792b847ee1
am fcab475c: Merge "record the last event received regardless of having clients or not" into gingerbread
...
* commit 'fcab475c906da5c159bc56a32c2610f6f55eafd9':
record the last event received regardless of having clients or not
2010-11-11 14:49:35 -08:00
Mathias Agopian
fcab475c90
Merge "record the last event received regardless of having clients or not" into gingerbread
2010-11-11 14:44:08 -08:00
Scott Main
4fb51ca1a9
docs: misc changes to sdk setup docs
...
update sdk manager screenshot;
update info about new manager UI;
more info about the windows installer;
Change-Id: Ic4a582ba28f02e2c787901a575194ae884be396e
2010-11-11 11:59:13 -08:00
Scott Main
93896ad879
am dfb12218: docs: revise adding components with info about platform-tools
...
* commit 'dfb122180c7028764136ac3a4fa07104f601de84':
docs: revise adding components with info about platform-tools
2010-11-11 11:00:44 -08:00
Scott Main
dfb122180c
docs: revise adding components with info about platform-tools
...
Change-Id: I3b4afca09fc81d41f3017fd78e64f44b11f9ec12
2010-11-11 10:48:45 -08:00
Amith Yamasani
f8d2aff41d
am db65907a: Merge "Adding pan behavior on preference dialog."
...
* commit 'db65907a2148f053e51f941979f0f7694acd5923':
Adding pan behavior on preference dialog.
2010-11-11 09:06:02 -08:00
Amith Yamasani
db65907a21
Merge "Adding pan behavior on preference dialog."
2010-11-11 08:50:52 -08:00
John Wang
1ed7d65b5d
am fac4a689: Merge "Fix the audio mode glitch during hangup." into gingerbread
...
* commit 'fac4a689f86b0d46a2c76cec0a6ce2f4bac2a22a':
Fix the audio mode glitch during hangup.
2010-11-10 19:28:31 -08:00
John Wang
fac4a689f8
Merge "Fix the audio mode glitch during hangup." into gingerbread
2010-11-10 19:11:20 -08:00
Dianne Hackborn
63f40387d9
am 34594e75: Merge "Fix issue #3177284 : Account for wake lock power usage on Crespo" into gingerbread
...
* commit '34594e75e4a7962840f34c0b57116ecf1497f118':
Fix issue #3177284 : Account for wake lock power usage on Crespo
2010-11-10 18:01:21 -08:00
Dianne Hackborn
34594e75e4
Merge "Fix issue #3177284 : Account for wake lock power usage on Crespo" into gingerbread
2010-11-10 17:58:28 -08:00
Mathias Agopian
3a9223ebf8
record the last event received regardless of having clients or not
...
We only recorded the last received event (which is needed when a sensor
is activated on a connection) when there was some connection active.
This should fix an issue where sometimes the light sensor doesn't
return an event whent activated.
we also didn't need to hold the main lock while dispatching events
to clients.
Change-Id: I6c6386c040051ce205e3c0516c678e0603fa45e1
2010-11-10 17:50:28 -08:00
Jeff Brown
5314335c9e
am 00e5dd44: Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread
...
* commit '00e5dd44f6d014fff8c65b9c718f5641f5eae4bb':
Fix JNI reference leak in NativeActivity. (DO NOT MERGE)
2010-11-10 16:04:13 -08:00
Jeff Brown
00e5dd44f6
Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread
2010-11-10 16:00:37 -08:00