Mike Lockwood
18b4edec27
am dae19d7c: am aaf39f84: Merge "GPS: remove GpsEventThread from GpsLocationProvider" into gingerbread
...
Merge commit 'dae19d7c00455e500cc9731071557ea91f162a7d'
* commit 'dae19d7c00455e500cc9731071557ea91f162a7d':
GPS: remove GpsEventThread from GpsLocationProvider
2010-06-23 10:31:00 -07:00
Jack Palevich
037256be7e
am 1e08cc1d: am 224107a4: Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
...
Merge commit '1e08cc1dfda9a0264fcf62898af0bdd6ed5a205c'
* commit '1e08cc1dfda9a0264fcf62898af0bdd6ed5a205c':
Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
2010-06-23 10:30:34 -07:00
Mathias Agopian
a3cf303ad6
am a4f98094: am 07ccf5ad: remove unused YUV formats
...
Merge commit 'a4f980948e112cfdcc7051e12e29c71b78383a6f'
* commit 'a4f980948e112cfdcc7051e12e29c71b78383a6f':
remove unused YUV formats
2010-06-23 10:30:16 -07:00
James Dong
aa03c1097c
am d076b590: am 875500b4: Merge "AmrInputStream refresh: eliminate the dependency upon OpenCore\'s code" into gingerbread
...
Merge commit 'd076b59012f93fa3a3f1fa2d0893629126a4f13b'
* commit 'd076b59012f93fa3a3f1fa2d0893629126a4f13b':
AmrInputStream refresh: eliminate the dependency upon OpenCore's code
2010-06-23 10:30:07 -07:00
Brad Fitzpatrick
f9e01ea481
am efcf68aa: am ef8f96a7: Merge "Start of work on passing around StrictMode policy over Binder calls." into gingerbread
...
Merge commit 'efcf68aa1fd7fcfd52cf3d2837ed8db8e797194b'
* commit 'efcf68aa1fd7fcfd52cf3d2837ed8db8e797194b':
Start of work on passing around StrictMode policy over Binder calls.
2010-06-23 10:18:18 -07:00
Mathias Agopian
60af8760d6
am b9fd188a: am d91ac98a: fix [2785833] valgrind error in android::Layer::requestBuffer
...
Merge commit 'b9fd188a0b1cd71e38c03a7bb4a4688eedf83667'
* commit 'b9fd188a0b1cd71e38c03a7bb4a4688eedf83667':
fix [2785833] valgrind error in android::Layer::requestBuffer
2010-06-23 10:18:06 -07:00
Mathias Agopian
243ce507c4
am cefb8858: am 28333315: Merge "Added support for the GL_TEXTURE_EXTERNAL target" into gingerbread
...
Merge commit 'cefb88587443323d147e687ff78eae9195eb584c'
* commit 'cefb88587443323d147e687ff78eae9195eb584c':
Added support for the GL_TEXTURE_EXTERNAL target
2010-06-23 10:17:56 -07:00
Mathias Agopian
46640ff993
am bf900939: am 7e73a2ce: Merge "Improve SensorManager documentation" into gingerbread
...
Merge commit 'bf9009396b1cba1f99f65c0ea9f5ef8532df1ab6'
* commit 'bf9009396b1cba1f99f65c0ea9f5ef8532df1ab6':
Improve SensorManager documentation
2010-06-23 10:17:42 -07:00
Jeff Brown
12c9ce8bc4
am b1efc3f6: am 7fbdc84e: More native input event dispatching.
...
Merge commit 'b1efc3f68277a8c38c21e2d2e8ce05287118ecfe'
* commit 'b1efc3f68277a8c38c21e2d2e8ce05287118ecfe':
More native input event dispatching.
2010-06-23 10:17:22 -07:00
Steve Block
718a4ecd56
Merge "Adds a Geolocation permission handler to the WebRuntime"
2010-06-23 07:45:51 -07:00
Jason Sams
2966efc2b9
Merge "Fix 32&24 ->16 bit bitmap uploads."
2010-06-22 17:46:18 -07:00
Jason Sams
f72bf05ae2
Merge "Re-enable optimization for detecting nop state changes in fragment and vertex programs."
2010-06-22 17:23:47 -07:00
Vasu Nori
c297df055f
Merge "fix broken current.xml"
2010-06-22 16:05:11 -07:00
Vasu Nori
f5825be44f
Merge "for memory databases, don't set journal_mode and don't allow WAL"
2010-06-22 15:53:18 -07:00
John Wang
e45202ac2f
Merge "Create CallManager class."
2010-06-22 13:56:44 -07:00
Mike Lockwood
10810e7bc0
Merge "MTP: Use a fd instead of a file path in file transfer ioctls."
2010-06-22 13:40:09 -07:00
Mike Lockwood
aec9a875e6
Merge "mtptest: Add option to specify storage path at the command line."
2010-06-22 13:39:36 -07:00
Romain Guy
54331629b4
Merge "Fix simulator build again."
2010-06-22 13:30:14 -07:00
Vasu Nori
81488d75b1
Merge "when corruption occurs, not clsing the db is casuing stack overflow"
2010-06-22 13:13:16 -07:00
Romain Guy
2857f969e4
Merge "Fix the simulator build."
2010-06-22 13:12:44 -07:00
Grace Kloba
aa94a360cd
Merge "Add a WebSettings to control whether WebView will use some perf trick, e.g. pause updating the picture, during panning and zooming transition."
2010-06-22 10:39:18 -07:00
Mike Lockwood
b8d5e41c6a
am aaf39f84: Merge "GPS: remove GpsEventThread from GpsLocationProvider" into gingerbread
...
Merge commit 'aaf39f84063b8fee51bcdb0731d68c328b6a3c3d' into gingerbread-plus-aosp
* commit 'aaf39f84063b8fee51bcdb0731d68c328b6a3c3d':
GPS: remove GpsEventThread from GpsLocationProvider
2010-06-22 06:45:03 -07:00
Mike Lockwood
4acbc54dda
Merge "GPS: remove GpsEventThread from GpsLocationProvider" into gingerbread
2010-06-22 06:44:03 -07:00
Ben Murdoch
f63483376c
Merge "Web runtime - link following with simple SOP check - back button - fullscreen (title shown as toast for now)"
2010-06-22 05:45:43 -07:00
Jack Palevich
0a51628683
am 224107a4: Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
...
Merge commit '224107a421e2611b15d1ec736df54bca9ee3e78d' into gingerbread-plus-aosp
* commit '224107a421e2611b15d1ec736df54bca9ee3e78d':
Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
2010-06-22 05:16:24 -07:00
Jack Palevich
b3ffef9dfe
Add OpenGL ES 2.0 VBO versions glDrawElements and glVertexAttribPointer.
...
Change-Id: Id0069535e97fe96eef74e4d0c1d19b010061fe3b
2010-06-22 20:08:40 +08:00
Romain Guy
e170304161
Merge "Add glOrtho equivalent to the OpenGL ES 2.0 renderer."
2010-06-21 19:36:59 -07:00
Mathias Agopian
2825a7dae1
am 07ccf5ad: remove unused YUV formats
...
Merge commit '07ccf5ad7edfeeebb79208ad3e8a52917fe038a8' into gingerbread-plus-aosp
* commit '07ccf5ad7edfeeebb79208ad3e8a52917fe038a8':
remove unused YUV formats
2010-06-21 18:42:23 -07:00
Jason Sams
f8aed6b04f
Merge "Fix build error."
2010-06-21 18:33:17 -07:00
Mathias Agopian
3f3a74a53a
remove unused YUV formats
...
Change-Id: Id0ae28b1700cf771cdbe0ca27b139d32cab90b2a
2010-06-21 18:22:09 -07:00
Jason Sams
59f509e2d1
Merge "Move ImageProcessing and ModelViewer to reflected files. Implement boolean support."
2010-06-21 17:45:57 -07:00
Jason Sams
abd8fee235
Merge "Remove the obsolete film example."
2010-06-21 17:44:35 -07:00
Jason Sams
ea7edda281
Merge "Fountain example cleanup. Remove compatability versions of rsg functions that took old 'i' types."
2010-06-21 17:44:25 -07:00
James Dong
c76832197c
am 875500b4: Merge "AmrInputStream refresh: eliminate the dependency upon OpenCore\'s code" into gingerbread
...
Merge commit '875500b47ac74a164f7792ce89a16d600ea72695' into gingerbread-plus-aosp
* commit '875500b47ac74a164f7792ce89a16d600ea72695':
AmrInputStream refresh: eliminate the dependency upon OpenCore's code
2010-06-21 17:37:15 -07:00
James Dong
0ed252d4f4
Merge "AmrInputStream refresh: eliminate the dependency upon OpenCore's code" into gingerbread
2010-06-21 17:35:27 -07:00
Gilles Debunne
902fe2f39a
Merge "Fixed scrolling issue when moving cursor in long TextViews."
2010-06-21 16:56:15 -07:00
Daniel Lehmann
f4c47a5c3e
Merge "Remove ContactHeaderWidget, because it lives directly in the Contacts App from now on"
2010-06-21 16:36:58 -07:00
Adam Powell
829af3b832
Merge "Changes for bluetooth keyboard support."
2010-06-21 16:36:57 -07:00
Brad Fitzpatrick
8e10e50f29
am ef8f96a7: Merge "Start of work on passing around StrictMode policy over Binder calls." into gingerbread
...
Merge commit 'ef8f96a717554a85aa63a60f8c61be2afbd12a5c' into gingerbread-plus-aosp
* commit 'ef8f96a717554a85aa63a60f8c61be2afbd12a5c':
Start of work on passing around StrictMode policy over Binder calls.
2010-06-21 15:32:56 -07:00
Robert Greenwalt
9ac04de58d
Merge "Don't modify a list while iterating."
2010-06-21 15:32:43 -07:00
Brad Fitzpatrick
03bd2484c8
Merge "Start of work on passing around StrictMode policy over Binder calls." into gingerbread
2010-06-21 15:31:01 -07:00
Mathias Agopian
5afcf4cdeb
am d91ac98a: fix [2785833] valgrind error in android::Layer::requestBuffer
...
Merge commit 'd91ac98a8ead216b12af6df61d90229b74c7f0f6' into gingerbread-plus-aosp
* commit 'd91ac98a8ead216b12af6df61d90229b74c7f0f6':
fix [2785833] valgrind error in android::Layer::requestBuffer
2010-06-21 15:24:02 -07:00
Mathias Agopian
f955be995d
fix [2785833] valgrind error in android::Layer::requestBuffer
...
fix uninitialized variable
Change-Id: I99e1b619ae8c88dd9d77b3abf4762f801019047e
2010-06-21 15:19:26 -07:00
Mathias Agopian
38c371361b
am 28333315: Merge "Added support for the GL_TEXTURE_EXTERNAL target" into gingerbread
...
Merge commit '28333315c6f62b303de2ec0ac9e48158ed419f06' into gingerbread-plus-aosp
* commit '28333315c6f62b303de2ec0ac9e48158ed419f06':
Added support for the GL_TEXTURE_EXTERNAL target
2010-06-21 15:14:29 -07:00
Mathias Agopian
8207575c21
am 7e73a2ce: Merge "Improve SensorManager documentation" into gingerbread
...
Merge commit '7e73a2ce17740abd028d9944c423e191e5b4854c' into gingerbread-plus-aosp
* commit '7e73a2ce17740abd028d9944c423e191e5b4854c':
Improve SensorManager documentation
2010-06-21 15:12:14 -07:00
Mathias Agopian
b16fa651dd
Merge "Added support for the GL_TEXTURE_EXTERNAL target" into gingerbread
2010-06-21 15:11:18 -07:00
Mathias Agopian
06a7cd44e1
Merge "Improve SensorManager documentation" into gingerbread
2010-06-21 15:10:13 -07:00
Jean-Baptiste Queru
98815ecfdf
Merge "Recover a handful of commits that were reverted earlier"
2010-06-21 14:29:47 -07:00
Robert Greenwalt
a29e9300ad
Merge "Reorder ThrottleService startup to avoid race."
2010-06-21 14:12:38 -07:00
Jeff Brown
a7a0b1ec5c
am 7fbdc84e: More native input event dispatching.
...
Merge commit '7fbdc84e87dd3a0e196b9803bb04495d11e9cb8a' into gingerbread-plus-aosp
* commit '7fbdc84e87dd3a0e196b9803bb04495d11e9cb8a':
More native input event dispatching.
2010-06-21 14:06:31 -07:00