Dianne Hackborn
c1c3308f03
am e3e2883f: am e24a60aa: Merge "First stab at attaching native event dispatching." into gingerbread
...
Merge commit 'e3e2883f2232007174ead562610eb01201890d9b'
* commit 'e3e2883f2232007174ead562610eb01201890d9b':
First stab at attaching native event dispatching.
2010-06-23 10:32:25 -07:00
Dirk Dougherty
1139bcebd8
am ca36e9ee: am 7c1a2dfa: am 17ae6465: Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo
...
Merge commit 'ca36e9eebe252e04dbadeb07282c1eba8d9f080b'
* commit 'ca36e9eebe252e04dbadeb07282c1eba8d9f080b':
Doc change: Fix description of certificate matching requirement for app updates.
2010-06-23 10:32:21 -07:00
Daniel Sandler
e94ff71e13
am 57b53265: am ef730e6e: Merge "Fix javadocs." into gingerbread
...
Merge commit '57b5326561b6edb22b09016985b41b7cdb2156c0'
* commit '57b5326561b6edb22b09016985b41b7cdb2156c0':
Fix javadocs.
2010-06-23 10:32:02 -07:00
Andreas Huber
0c11980317
am 6adf0c4d: am ef1c48d6: Merge "Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not." into gingerbread
...
Merge commit '6adf0c4de62f0b13b84f18c6cda254a8dfeb2296'
* commit '6adf0c4de62f0b13b84f18c6cda254a8dfeb2296':
Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not.
2010-06-23 10:31:50 -07:00
Andreas Huber
035d46765f
am 235073a5: am 8a42f881: Merge "Make sure sine: is supported again in stagefright commandline tool." into gingerbread
...
Merge commit '235073a549ec664caea93e0ccded95e4a6819b6b'
* commit '235073a549ec664caea93e0ccded95e4a6819b6b':
Make sure sine: is supported again in stagefright commandline tool.
2010-06-23 10:31:43 -07:00
James Dong
a013856bd2
am 06967683: am e5671bfe: Merge "Audio/video sync during recording (second part)" into gingerbread
...
Merge commit '0696768374567afa4fe58c2ef0af948b72e83e5d'
* commit '0696768374567afa4fe58c2ef0af948b72e83e5d':
Audio/video sync during recording (second part)
2010-06-23 10:31:36 -07:00
Daniel Sandler
d917cab9e7
am 71764c4c: am 613dde4a: Revised "immersive mode" API.
...
Merge commit '71764c4ce5b248a79542238b171a783e82e0fe37'
* commit '71764c4ce5b248a79542238b171a783e82e0fe37':
Revised "immersive mode" API.
2010-06-23 10:31:21 -07:00
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
Dianne Hackborn
0b02475868
am e24a60aa: Merge "First stab at attaching native event dispatching." into gingerbread
...
Merge commit 'e24a60aa4670fb835772b23ff665bb368fa65e30' into gingerbread-plus-aosp
* commit 'e24a60aa4670fb835772b23ff665bb368fa65e30':
First stab at attaching native event dispatching.
2010-06-22 11:26:02 -07:00
Dirk Dougherty
32484349c9
am 7c1a2dfa: am 17ae6465: Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo
...
Merge commit '7c1a2dfa8930fd12bb8791fc02bace751917bdee' into gingerbread-plus-aosp
* commit '7c1a2dfa8930fd12bb8791fc02bace751917bdee':
Doc change: Fix description of certificate matching requirement for app updates.
2010-06-22 11:25:59 -07:00
Dianne Hackborn
64b74fb3bd
Merge "First stab at attaching native event dispatching." into gingerbread
2010-06-22 11:22:37 -07:00
Dirk Dougherty
8c47239db5
am 17ae6465: Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo
...
Merge commit '17ae646586663c59ad360bb72884beded7475687' into gingerbread
* commit '17ae646586663c59ad360bb72884beded7475687':
Doc change: Fix description of certificate matching requirement for app updates.
2010-06-22 11:22:12 -07:00
Dianne Hackborn
4d96bb6ae3
First stab at attaching native event dispatching.
...
Provides the basic infrastructure for a
NativeActivity's native code to get an object representing
its event stream that can be used to read input events.
Still work to do, probably some API changes, and reasonable
default key handling (so that for example back will still
work).
Change-Id: I6db891bc35dc9683181d7708eaed552b955a077e
2010-06-22 11:21:50 -07:00
Dirk Dougherty
0f63401fb8
Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo
2010-06-22 11:13:48 -07:00
Daniel Sandler
de92bcdf7c
am ef730e6e: Merge "Fix javadocs." into gingerbread
...
Merge commit 'ef730e6ececa96a3e0576140eea707f7c48cd66c' into gingerbread-plus-aosp
* commit 'ef730e6ececa96a3e0576140eea707f7c48cd66c':
Fix javadocs.
2010-06-22 11:10:18 -07:00
Daniel Sandler
bbc1e52b77
Merge "Fix javadocs." into gingerbread
2010-06-22 11:08:40 -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
Andreas Huber
cabcd0657e
am ef1c48d6: Merge "Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not." into gingerbread
...
Merge commit 'ef1c48d6a976f56bf7f7a41a5b2e8725af988362' into gingerbread-plus-aosp
* commit 'ef1c48d6a976f56bf7f7a41a5b2e8725af988362':
Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not.
2010-06-22 10:12:32 -07:00
Andreas Huber
08e104d957
am 8a42f881: Merge "Make sure sine: is supported again in stagefright commandline tool." into gingerbread
...
Merge commit '8a42f8817de0fc178059bfb1288732d2de65259d' into gingerbread-plus-aosp
* commit '8a42f8817de0fc178059bfb1288732d2de65259d':
Make sure sine: is supported again in stagefright commandline tool.
2010-06-22 10:12:29 -07:00
Andreas Huber
7339c132f4
Merge "Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not." into gingerbread
2010-06-22 10:11:15 -07:00
Andreas Huber
77d235857d
Merge "Make sure sine: is supported again in stagefright commandline tool." into gingerbread
2010-06-22 10:11:04 -07:00
James Dong
a72251666b
am e5671bfe: Merge "Audio/video sync during recording (second part)" into gingerbread
...
Merge commit 'e5671bfe51aeaac823cd94f8e04f01e37b4c2cd6' into gingerbread-plus-aosp
* commit 'e5671bfe51aeaac823cd94f8e04f01e37b4c2cd6':
Audio/video sync during recording (second part)
2010-06-22 10:06:37 -07:00
James Dong
5158e88db1
Merge "Audio/video sync during recording (second part)" into gingerbread
2010-06-22 10:05:02 -07:00
Daniel Sandler
679e494090
am 613dde4a: Revised "immersive mode" API.
...
Merge commit '613dde4aa651e11dac3db859723cc6faf8fc0a82' into gingerbread-plus-aosp
* commit '613dde4aa651e11dac3db859723cc6faf8fc0a82':
Revised "immersive mode" API.
2010-06-22 09:36:07 -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