David Li
2428f3f994
Merge "GLES2Dbg: added CaptureDraw and CaptureSwap options"
2011-04-18 15:26:59 -07:00
David Li
e9f74da685
Merge "GLES2Dbg: use dump.gles2dbg file when fails to create socket"
2011-04-18 15:26:51 -07:00
David Li
2d1849db2f
Merge "GLES2Dbg: add EXTEND_AFTER_CALL_Debug_* macro and improve protocol"
2011-04-18 15:26:39 -07:00
David Li
6563241394
Merge "GLES2Dbg: change GLES2_dbg to shared library"
2011-04-18 15:26:31 -07:00
Wink Saville
e981b65330
am 64c42cae: Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.
...
* commit '64c42cae4482fe0157e977b8ddd0f2c2436b3f31':
Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.
2011-04-18 15:24:47 -07:00
Dianne Hackborn
4e1e770a5c
Merge "Integrate from support lib: fix restore of list state."
2011-04-18 14:23:04 -07:00
Wink Saville
4447c02922
am 9a2c9390: am 6f200f73: Merge "Data connection attempts/retries for multiple APNs" into honeycomb-LTE
...
* commit '9a2c93905a2a65db7135f48ca5653d3cf614faed':
Data connection attempts/retries for multiple APNs
2011-04-18 13:39:49 -07:00
Wink Saville
a05ad30fd7
am 6f200f73: Merge "Data connection attempts/retries for multiple APNs" into honeycomb-LTE
...
* commit '6f200f738ed0bbdef5c433b5f571fcb591e1760c':
Data connection attempts/retries for multiple APNs
2011-04-18 13:36:32 -07:00
Wink Saville
cabddf9c27
Merge "Data connection attempts/retries for multiple APNs" into honeycomb-LTE
2011-04-18 13:28:49 -07:00
Bjorn Bringert
c3cdf4ff1b
Merge "Only return default TTS engines from TTS.getEngines()"
2011-04-18 12:34:47 -07:00
Jean-Michel Trivi
a59d918003
Merge "Fix bug 2659754 ConcurrentModificationException in audio focus changes"
2011-04-18 11:20:20 -07:00
Fabrice Di Meglio
9f513c5e0d
Merge "Add Unicode BiDi Algo before drawing text in Canvas"
2011-04-18 11:15:57 -07:00
Jean-Michel Trivi
e0e5eae3bb
Merge "Fix bug 2724503 Persist media button receiver across reboots"
2011-04-18 11:02:34 -07:00
Stephen Hines
69be0ab40c
Merge "Fix broken assert (if input allocation is NULL)."
2011-04-18 10:25:57 -07:00
Andreas Huber
6e9eb7453f
Merge "Parcel::appendFrom({const } Parcel *parcel, size_t, size_t)"
2011-04-18 08:12:36 -07:00
Scott Main
ebcfef275e
am 62174ac1: am 74c890a5: am 1f07f125: am 6669f251: docs: fix snippet errors in web doc
...
* commit '62174ac1a203e2ab57fd91837e7e67b0c578ecbe':
docs: fix snippet errors in web doc
2011-04-18 03:28:26 -07:00
Scott Main
72eeea895b
am 74c890a5: am 1f07f125: am 6669f251: docs: fix snippet errors in web doc
...
* commit '74c890a57a819a0245573987455088c111e2c4eb':
docs: fix snippet errors in web doc
2011-04-18 03:18:06 -07:00
Scott Main
624ef518ee
am 1f07f125: am 6669f251: docs: fix snippet errors in web doc
...
* commit '1f07f1257b62f2ac71696bb430f9328597c3de27':
docs: fix snippet errors in web doc
2011-04-18 03:08:32 -07:00
Wink Saville
d46a213e44
am 5f7edb2c: am a9378485: Merge "Telephony: GDCT - Set enabled state before notification is sent out." into honeycomb-LTE
...
* commit '5f7edb2c53b2432ea3426c563d9743338ba1d064':
Telephony: GDCT - Set enabled state before notification is sent out.
2011-04-16 14:52:04 -07:00
Wink Saville
d1dd80b7b3
am d86e06f7: am df43e321: Merge "Telephony: Set Radio turned off reason when powered off." into honeycomb-LTE
...
* commit 'd86e06f7db0705b5fa64f23dcecf305133d2acc7':
Telephony: Set Radio turned off reason when powered off.
2011-04-16 14:50:10 -07:00
Wink Saville
cb83034459
am fa65533e: am dc26a0c8: Merge "Clean up calls immediately if cid become inactive in unsol data state changed" into honeycomb-LTE
...
* commit 'fa65533ef11e794b21580e5583a74d2d8ffb7047':
Clean up calls immediately if cid become inactive in unsol data state changed
2011-04-16 14:50:06 -07:00
Wink Saville
bdd81b7335
am a9378485: Merge "Telephony: GDCT - Set enabled state before notification is sent out." into honeycomb-LTE
...
* commit 'a9378485cb8d0968a9a177f730875e0f1d49d689':
Telephony: GDCT - Set enabled state before notification is sent out.
2011-04-16 14:49:07 -07:00
Wink Saville
db3de26fe8
am 6708e008: am 585b7acb: Merge "handle missing constants when creating a Phone instance" into honeycomb-LTE
...
* commit '6708e008ef29b5221960d3b42ca8fcc192108192':
handle missing constants when creating a Phone instance
2011-04-16 14:48:10 -07:00
Ramesh Sudini
d7e5d0d961
am dff90b7d: am a5c9c724: Data Availability Indication changes.
...
* commit 'dff90b7d161bd7d11d931a43aad79d87e7f4dfc1':
Data Availability Indication changes.
2011-04-16 14:47:56 -07:00
Wink Saville
ced5bec63b
am df43e321: Merge "Telephony: Set Radio turned off reason when powered off." into honeycomb-LTE
...
* commit 'df43e321778a02f9eaeb8faacf4ae7917c434106':
Telephony: Set Radio turned off reason when powered off.
2011-04-16 14:47:17 -07:00
Wink Saville
2bc80c4a92
am dc26a0c8: Merge "Clean up calls immediately if cid become inactive in unsol data state changed" into honeycomb-LTE
...
* commit 'dc26a0c8d4ce4edcddcfc6b8e810ae5f8e73cda4':
Clean up calls immediately if cid become inactive in unsol data state changed
2011-04-16 14:47:15 -07:00
Wink Saville
3130010f7f
Merge "Telephony: GDCT - Set enabled state before notification is sent out." into honeycomb-LTE
2011-04-16 14:45:42 -07:00
Wink Saville
66b997b7bc
am 585b7acb: Merge "handle missing constants when creating a Phone instance" into honeycomb-LTE
...
* commit '585b7acb16183ae31e71912dc2bfceea421be157':
handle missing constants when creating a Phone instance
2011-04-16 14:45:28 -07:00
Ramesh Sudini
f9a499b7eb
am a5c9c724: Data Availability Indication changes.
...
* commit 'a5c9c7246b065710227395ec4a7c1df0168363ef':
Data Availability Indication changes.
2011-04-16 14:45:19 -07:00
Wink Saville
aa349179e7
Merge "Telephony: Set Radio turned off reason when powered off." into honeycomb-LTE
2011-04-16 14:44:08 -07:00
Wink Saville
c3b28e4563
Merge "Clean up calls immediately if cid become inactive in unsol data state changed" into honeycomb-LTE
2011-04-16 14:43:30 -07:00
Wink Saville
9e5fdca509
Merge "handle missing constants when creating a Phone instance" into honeycomb-LTE
2011-04-16 14:42:49 -07:00
Mathias Agopian
a36a302e92
Merge "Fix a GraphicBuffer leak in SurfaceTexture"
2011-04-15 18:15:13 -07:00
Scott Main
0f03c71f66
am 6669f251: docs: fix snippet errors in web doc
...
* commit '6669f251391d7e61a6ea55e2538c941f82514dd9':
docs: fix snippet errors in web doc
2011-04-15 18:03:14 -07:00
Wink Saville
ecdd04ce87
am 9bd1368b: am 6ed4798c: Merge "Cleanup/add log statements." into honeycomb-LTE
...
* commit '9bd1368bb431d701604a48b226ee362fc7838c6a':
Cleanup/add log statements.
2011-04-15 15:48:48 -07:00
Wink Saville
2111ecf2f2
am 6ed4798c: Merge "Cleanup/add log statements." into honeycomb-LTE
...
* commit '6ed4798c70bf4ba253a8cdd37bf48008af81da7d':
Cleanup/add log statements.
2011-04-15 15:46:27 -07:00
Wink Saville
47a40c1d4a
Merge "Cleanup/add log statements." into honeycomb-LTE
2011-04-15 15:44:18 -07:00
Wink Saville
eedca277e8
am 93a3f72a: am cb0c5f16: Merge "Change RIL initialization." into honeycomb-LTE
...
* commit '93a3f72aa0475e08bbe7de8d512f7149428aaf2d':
Change RIL initialization.
2011-04-15 15:41:35 -07:00
Wink Saville
f7f002a8bd
am cb0c5f16: Merge "Change RIL initialization." into honeycomb-LTE
...
* commit 'cb0c5f16e9131e73cda38ce18c00a31b1d5be2c3':
Change RIL initialization.
2011-04-15 15:39:09 -07:00
Wink Saville
29f61001a4
Merge "Change RIL initialization." into honeycomb-LTE
2011-04-15 15:36:43 -07:00
Eric Fischer
5ef87f1088
Merge "Import revised translations."
2011-04-15 15:01:11 -07:00
Dianne Hackborn
afdbaca1d2
Merge "More battery stats improvements."
2011-04-15 12:54:15 -07:00
Bjorn Bringert
bbdfeadb5d
Merge "Improve TTS engine audio buffer API"
2011-04-15 07:28:40 -07:00
Wu-cheng Li
48b5d315af
Merge "Fix camera javadoc errors."
2011-04-15 04:21:43 -07:00
Steve Block
4b678eb581
Merge "Adding WebElement.java which provides DOM friendly API function to lookup HTML elements in the page."
2011-04-15 03:17:46 -07:00
Bjorn Bringert
a2ad6b74a3
Add Java API for writing TTS engines
...
This removes the old non-public C++ API for TTS
engines and replaces it with a Java API.
The new API is still @hidden, until it has been approved.
Bug: 4148636
Change-Id: I7614ff788e11f897e87052f684f1b4938d539fb7
2011-04-15 10:04:31 +01:00
Jim Miller
1395259fd6
Merge "Use system IME for LockScreen password mode."
2011-04-15 01:07:45 -07:00
Elliott Hughes
c45f78c867
Merge "Replace a custom AndroidRuntime::findClass with a more targeted fix."
2011-04-14 17:00:52 -07:00
Dianne Hackborn
fd07b866bc
am 07a630d2: am 9a03a73a: am f6f87c98: Merge "Fix issue #4291805 : Tap Fish crashes on launch" into honeycomb-mr1
...
* commit '07a630d23ef326f820e6339b5f691df0aafd3574':
Fix issue #4291805 : Tap Fish crashes on launch
2011-04-14 15:43:03 -07:00
Dianne Hackborn
0932c14330
am 9a03a73a: am f6f87c98: Merge "Fix issue #4291805 : Tap Fish crashes on launch" into honeycomb-mr1
...
* commit '9a03a73a44c69706fe2b97a28632928f58b434b1':
Fix issue #4291805 : Tap Fish crashes on launch
2011-04-14 15:40:00 -07:00