Commit Graph

16373 Commits

Author SHA1 Message Date
Chia-chi Yeh
cd905992f2 am 3238302b: Merge "media: add AudioRecord::getMinFrameCount()." into gingerbread
Merge commit '3238302b1819bb384b79402c0106a2bdfc3f35d0' into gingerbread-plus-aosp

* commit '3238302b1819bb384b79402c0106a2bdfc3f35d0':
  media: add AudioRecord::getMinFrameCount().
2010-06-22 17:22:10 -07:00
Chia-chi Yeh
014c9c78ea Merge "media: add AudioRecord::getMinFrameCount()." into gingerbread 2010-06-22 17:20:44 -07:00
Eric Laurent
3f41a557c6 am d1559d6b: Merge "Fix issue 2301630: Mismatch of state occurs when media server is killed while in-call." into gingerbread
Merge commit 'd1559d6b2db1d7e1718a15dc43a82450de2934db' into gingerbread-plus-aosp

* commit 'd1559d6b2db1d7e1718a15dc43a82450de2934db':
  Fix issue 2301630:  Mismatch of state occurs when media server is killed while in-call.
2010-06-22 17:11:54 -07:00
Eric Laurent
d237cebac3 Merge "Fix issue 2301630: Mismatch of state occurs when media server is killed while in-call." into gingerbread 2010-06-22 17:08:55 -07:00
James Dong
afaa3f8a26 am 750600a1: Merge "Single track optimization" into gingerbread
Merge commit '750600a187f699ead85ef026ab33dc2bdd1d2c29' into gingerbread-plus-aosp

* commit '750600a187f699ead85ef026ab33dc2bdd1d2c29':
  Single track optimization
2010-06-22 14:29:42 -07:00
James Dong
04d287b6e0 Merge "Single track optimization" into gingerbread 2010-06-22 14:28:15 -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
Dirk Dougherty
b38d6045c8 am 17ae6465: Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo
Merge commit '17ae646586663c59ad360bb72884beded7475687' into froyo-plus-aosp

* commit '17ae646586663c59ad360bb72884beded7475687':
  Doc change: Fix description of certificate matching requirement for app updates.
2010-06-22 11:24:01 -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
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
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
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
Mathias Agopian
3f3a74a53a remove unused YUV formats
Change-Id: Id0ae28b1700cf771cdbe0ca27b139d32cab90b2a
2010-06-21 18:22:09 -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
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
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
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
Jeff Brown
51d45a710e More native input event dispatching.
Added ANRs handling.
Added event injection.
Fixed a NPE ActivityManagerServer writing ANRs to the drop box.
Fixed HOME key interception.
Fixed trackball reporting.
Fixed pointer rotation in landscape mode.

Change-Id: I50340f559f22899ab924e220a78119ffc79469b7
2010-06-21 13:59:34 -07:00
Brad Fitzpatrick
702ea9d42f Start of work on passing around StrictMode policy over Binder calls.
This is (intendend to be) a no-op change.

At this stage, Binder RPCs just have an additional uint32 passed around
in the header, right before the interface name.  But nothing is actually
done with them yet.  That value should right now always be 0.

This now boots and seems to work.

Change-Id: I135b7c84f07575e6b9717fef2424d301a450df7b
2010-06-21 12:56:35 -07:00
Evan Millar
c7e9defdd3 am e47e3f38: Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread
Merge commit 'e47e3f3855a062ba0338a57eeda2f12a0f7a1fa8' into gingerbread-plus-aosp

* commit 'e47e3f3855a062ba0338a57eeda2f12a0f7a1fa8':
  Manual merge of change 53051 from master (DO NOT MERGE)
2010-06-21 12:10:55 -07:00
Evan Millar
a2f89660b4 Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread 2010-06-21 12:09:40 -07:00
The Android Open Source Project
ecfae4c86a merge from froyo-plus-aosp
Change-Id: I36dd4460cae6e3212d724e70ff1091cb791670cd
2010-06-21 11:23:45 -07:00
Kenny Root
c74dafe038 am f25c560d: am 30cf330f: Import revised translations
Merge commit 'f25c560dcdc0c04e11152fff11f521dae03522cd' into gingerbread-plus-aosp

* commit 'f25c560dcdc0c04e11152fff11f521dae03522cd':
  Import revised translations
2010-06-21 11:20:28 -07:00
Kenny Root
5adc399c76 am 30cf330f: Import revised translations
Merge commit '30cf330fae137587d51aa4c026459db146705ba9' into gingerbread

* commit '30cf330fae137587d51aa4c026459db146705ba9':
  Import revised translations
2010-06-21 11:17:07 -07:00
Kenny Root
f50f465b02 am 30cf330f: Import revised translations
Merge commit '30cf330fae137587d51aa4c026459db146705ba9' into froyo-plus-aosp

* commit '30cf330fae137587d51aa4c026459db146705ba9':
  Import revised translations
2010-06-21 11:16:25 -07:00
Kenny Root
9c4ff3a239 am c4e38577: Import revised translations
Merge commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17' into froyo-plus-aosp

* commit 'c4e38577f46a3b7953fffbb01b08eebc401fbc17':
  Import revised translations
2010-06-21 09:15:29 -07:00
Kenny Root
1f8017dc51 am cfe3d205: am c4e38577: Import revised translations
Merge commit 'cfe3d205b065502eecc460f7713de90e19d4ab4b' into gingerbread-plus-aosp

* commit 'cfe3d205b065502eecc460f7713de90e19d4ab4b':
  Import revised translations
2010-06-21 09:08:51 -07:00
Chia-chi Yeh
01d556026d am 2ce999fc: am bd240c27: media: add AudioTrack::getMinFrameCount().
Merge commit '2ce999fce785eb34b3a157db5ab5e17d31e2ea33' into gingerbread-plus-aosp

* commit '2ce999fce785eb34b3a157db5ab5e17d31e2ea33':
  media: add AudioTrack::getMinFrameCount().
2010-06-21 09:08:16 -07:00