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
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
John Wang
d19f44f3e3
Fix the audio mode glitch during hangup.
...
Fix bug # 3136179.
Keep audio mode as IN_CALL during hangup DISCONNECTING state
to prevent the NORMAL and IN_CALL glitch in auiod setMode.
Change-Id: I5513a3d5c65bd13ac054c9718c4dbd7d6db9eaf3
2010-11-10 15:35:51 -08:00
Scott Main
d4b5d85e2c
am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbread
...
* commit '77f5c9542e159cb9f2f2908227212d4add8ce74c':
docs: remove "new" tags from sample apps
2010-11-10 14:55:48 -08:00
Scott Main
77f5c9542e
resolved conflicts for merge of 5a726729 to gingerbread
...
Change-Id: I6060f31c45d49dfe4dbda52836150311b8992b15
2010-11-10 14:46:44 -08:00
Scott Main
5a72672977
docs: remove "new" tags from sample apps
...
Change-Id: I74dafa69f3638e2fe13c5edc7a54096943ffa164
2010-11-10 14:16:09 -08:00
Mathias Agopian
d6c7893d66
am 17fd21fc: Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread
...
* commit '17fd21fc0638d8734867b6f189efbabb227f3ae1':
DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions
2010-11-10 14:15:57 -08:00
Mathias Agopian
17fd21fc06
Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread
2010-11-10 14:09:17 -08:00
Brad Fitzpatrick
bf44ebae04
am 9de93424: Merge "Without SD card the shutdown sequence was delayed"
...
* commit '9de93424cc05446e3a216f406c55a3937c028416':
Without SD card the shutdown sequence was delayed
2010-11-10 11:07:18 -08:00
Scott Main
12a22635eb
am f4724cdd: Merge "docs: update eclipse guide for eclipse 3.6 also update system requirements" into gingerbread
...
* commit 'f4724cdd0b39eddb14a686ecaec05ff44258a7f7':
docs: update eclipse guide for eclipse 3.6 also update system requirements
2010-11-10 10:59:45 -08:00
Brad Fitzpatrick
9de93424cc
Merge "Without SD card the shutdown sequence was delayed"
2010-11-10 10:58:50 -08:00
Scott Main
f4724cdd0b
Merge "docs: update eclipse guide for eclipse 3.6 also update system requirements" into gingerbread
2010-11-10 10:46:36 -08:00
Owen Lin
8ffb135dc8
am 45ca778d: Merge "Make sure the controller will get repositioned after size changing." into gingerbread
...
* commit '45ca778d8ed90aff3f72fc85f806cedbd4121cc1':
Make sure the controller will get repositioned after size changing.
2010-11-10 08:25:02 -08:00
Owen Lin
45ca778d8e
Merge "Make sure the controller will get repositioned after size changing." into gingerbread
2010-11-09 19:02:23 -08:00
Mathias Agopian
0e43828799
am b48189cc: Merge "Improve gyro and accelerometer java doc" into gingerbread
...
* commit 'b48189ccfe42a408fb713565e54e165d255c6d66':
Improve gyro and accelerometer java doc
2010-11-09 17:24:57 -08:00
Mathias Agopian
b48189ccfe
Merge "Improve gyro and accelerometer java doc" into gingerbread
2010-11-09 17:12:11 -08:00
Scott Main
77847a3568
docs: update eclipse guide for eclipse 3.6
...
also update system requirements
Change-Id: I5433e9e73a85b10754d3c5d4561a8acf1ca66250
2010-11-09 16:47:52 -08:00
David 'Digit' Turner
b02ca27f05
am b7a109c0: Merge "Refresh EGL header to work with the NDK" into gingerbread
...
* commit 'b7a109c02735bb0d9e0bcb8f84e4aa3923701460':
Refresh EGL header to work with the NDK
2010-11-09 16:25:58 -08:00