ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
17,530 Commits 2 Branches 0 Tags 54 MiB
d4c8219354
Commit Graph

17530 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
40511fc60b am 98f7aed6: am 1e4b9f39: Remove InputConsumer, replacing with InputQueue. 
Merge commit '98f7aed66b54c365f816fe990de978f61155cde1'

* commit '98f7aed66b54c365f816fe990de978f61155cde1':
  Remove InputConsumer, replacing with InputQueue.
 2010-06-23 14:43:31 -07:00
Dianne Hackborn
dee2ba4efc am 1e4b9f39: Remove InputConsumer, replacing with InputQueue. 
Merge commit '1e4b9f3936d6f357e89360293e05a0e16d5fa440' into gingerbread-plus-aosp

* commit '1e4b9f3936d6f357e89360293e05a0e16d5fa440':
  Remove InputConsumer, replacing with InputQueue.
 2010-06-23 14:40:36 -07:00
Shimeng (Simon) Wang
fcf1b2cdfd Merge "Tweak fix for setXSSAuditorEnabled in LayoutTestController." 2010-06-23 14:15:20 -07:00
Daniel Sandler
cd4361ec15 am c82b4e80: am 69a4817e: Immersive activity API. 
Merge commit 'c82b4e80b8211851963929b33592bbc50358525b'

* commit 'c82b4e80b8211851963929b33592bbc50358525b':
  Immersive activity API.
 2010-06-23 13:37:59 -07:00
Daniel Sandler
ea8faffe04 am 69a4817e: Immersive activity API. 
Merge commit '69a4817e3e1e368e758ff8c238deb5ee26963c04' into gingerbread-plus-aosp

* commit '69a4817e3e1e368e758ff8c238deb5ee26963c04':
  Immersive activity API.
 2010-06-23 13:36:25 -07:00
Mike Lockwood
3fb6541885 am e4963260: am efbe2d78: Merge "andriod.location.Criteria: Simplify new location criteria APIs a bit." into gingerbread 
Merge commit 'e496326083450e8623268ed794176d980f99eb0c'

* commit 'e496326083450e8623268ed794176d980f99eb0c':
  andriod.location.Criteria: Simplify new location criteria APIs a bit.
 2010-06-23 13:23:28 -07:00
Andreas Huber
c1521e3b61 am 03e90f7e: am 58e9402b: Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into gingerbread 
Merge commit '03e90f7eeb032c981fc2952aa33f6ba1fae20d97'

* commit '03e90f7eeb032c981fc2952aa33f6ba1fae20d97':
  Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp
 2010-06-23 13:23:24 -07:00
Mike Lockwood
a22939d017 am efbe2d78: Merge "andriod.location.Criteria: Simplify new location criteria APIs a bit." into gingerbread 
Merge commit 'efbe2d78ee5e26b6606c8552a5c1ac70749a5013' into gingerbread-plus-aosp

* commit 'efbe2d78ee5e26b6606c8552a5c1ac70749a5013':
  andriod.location.Criteria: Simplify new location criteria APIs a bit.
 2010-06-23 13:20:20 -07:00
Andreas Huber
59acd0fa11 am 58e9402b: Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into gingerbread 
Merge commit '58e9402b12218ca498ea3b932e16819612b1ea87' into gingerbread-plus-aosp

* commit '58e9402b12218ca498ea3b932e16819612b1ea87':
  Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp
 2010-06-23 13:20:15 -07:00
Mike Lockwood
d7a5f0b7e2 Merge "andriod.location.Criteria: Simplify new location criteria APIs a bit." into gingerbread 2010-06-23 13:14:47 -07:00
Andreas Huber
c05f26c3fc Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into gingerbread 2010-06-23 13:14:16 -07:00
Andreas Huber
e9dc3cbdfd am 800af390: am b64af9a2: Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s. 
Merge commit '800af39038dcded12b66eccb8932a761e20b1976'

* commit '800af39038dcded12b66eccb8932a761e20b1976':
  Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s.
 2010-06-23 13:12:16 -07:00
Andreas Huber
21885866d4 am b64af9a2: Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s. 
Merge commit 'b64af9a221c1df4853ab7c7766d5f956c61b8765' into gingerbread-plus-aosp

* commit 'b64af9a221c1df4853ab7c7766d5f956c61b8765':
  Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s.
 2010-06-23 13:00:47 -07:00
Marco Nelissen
8df896dcdc Merge "Fix 2655246 file descriptor leak when accessing thumbnails http://b/2655246" 2010-06-23 12:42:30 -07:00
Adam Powell
8297f56cb5 am bc337d2f: am 73ccafb5: Merge "Fix a bug where requestDisallowInterceptTouchEvent does not get called when scrolling is resumed after stopping a fling." into gingerbread 
Merge commit 'bc337d2f675e8417be5534439e1b4ed1bc45a9c7'

* commit 'bc337d2f675e8417be5534439e1b4ed1bc45a9c7':
  Fix a bug where requestDisallowInterceptTouchEvent does not get called
 2010-06-23 12:41:46 -07:00
Scott Main
ccc21442ad am 0c837a2e: am 9fe2c4e2: am 753e5609: Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo 
Merge commit '0c837a2e35ed0f6354cbfb3c0e20260b817fd1e9'

* commit '0c837a2e35ed0f6354cbfb3c0e20260b817fd1e9':
  docs: update backup dev guide with Android Backup Service registration info
 2010-06-23 12:41:34 -07:00
Eric Laurent
4d9dfbd7c9 am 845f5414: am 2c2ce8e5: Merge "Added support for audio sessions in MediaPlayer and AudioTrack." into gingerbread 
Merge commit '845f541454d1fa9f328c0b0bf79acf2fba363177'

* commit '845f541454d1fa9f328c0b0bf79acf2fba363177':
  Added support for audio sessions in MediaPlayer and AudioTrack.
 2010-06-23 12:41:23 -07:00
Chia-chi Yeh
dec686ff90 am da9269af: am 3238302b: Merge "media: add AudioRecord::getMinFrameCount()." into gingerbread 
Merge commit 'da9269af5e94e25c142c519429aa77eb40f68e58'

* commit 'da9269af5e94e25c142c519429aa77eb40f68e58':
  media: add AudioRecord::getMinFrameCount().
 2010-06-23 12:40:34 -07:00
Eric Laurent
c4d3b8e4c9 am 7d329785: am d1559d6b: Merge "Fix issue 2301630: Mismatch of state occurs when media server is killed while in-call." into gingerbread 
Merge commit '7d329785f3f3111d99d58f75ac4e44cf1a65915f'

* commit '7d329785f3f3111d99d58f75ac4e44cf1a65915f':
  Fix issue 2301630:  Mismatch of state occurs when media server is killed while in-call.
 2010-06-23 12:40:28 -07:00
James Dong
ccf22aa9f3 am 9666d3c0: am 750600a1: Merge "Single track optimization" into gingerbread 
Merge commit '9666d3c0e7fc8ca98b4f5744d8427d008a79e698'

* commit '9666d3c0e7fc8ca98b4f5744d8427d008a79e698':
  Single track optimization
 2010-06-23 10:32:53 -07:00
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
Adam Powell
fe0a9e0472 am 73ccafb5: Merge "Fix a bug where requestDisallowInterceptTouchEvent does not get called when scrolling is resumed after stopping a fling." into gingerbread 
Merge commit '73ccafb5b843cdcf9c8f761fc72a69b4b7942aaf' into gingerbread-plus-aosp

* commit '73ccafb5b843cdcf9c8f761fc72a69b4b7942aaf':
  Fix a bug where requestDisallowInterceptTouchEvent does not get called
 2010-06-23 10:28:00 -07:00
Adam Powell
e595ffb218 Merge "Fix a bug where requestDisallowInterceptTouchEvent does not get called when scrolling is resumed after stopping a fling." into gingerbread 2010-06-23 10:26:44 -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
Scott Main
8c8e09ef03 am 9fe2c4e2: am 753e5609: Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo 
Merge commit '9fe2c4e2b89cbe4e22fdbcb3d5ecae1a853b133e' into gingerbread-plus-aosp

* commit '9fe2c4e2b89cbe4e22fdbcb3d5ecae1a853b133e':
  docs: update backup dev guide with Android Backup Service registration info
 2010-06-23 10:13:43 -07:00
Scott Main
62415f95f0 am 753e5609: Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo 
Merge commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b' into froyo-plus-aosp

* commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b':
  docs: update backup dev guide with Android Backup Service registration info
 2010-06-23 10:08:45 -07:00
Scott Main
98f8bc0669 am 753e5609: Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo 
Merge commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b' into gingerbread

* commit '753e56090ed5acc0d2173a8e9ab1a9b96528720b':
  docs: update backup dev guide with Android Backup Service registration info
 2010-06-23 10:07:37 -07:00
Scott Main
0d168d31d4 Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo 2010-06-23 09:57:46 -07:00
Steve Block
718a4ecd56 Merge "Adds a Geolocation permission handler to the WebRuntime" 2010-06-23 07:45:51 -07:00
Eric Laurent
f2bdb84af2 am 2c2ce8e5: Merge "Added support for audio sessions in MediaPlayer and AudioTrack." into gingerbread 
Merge commit '2c2ce8e53f5eb94916a5d0f40b2877cc7551870d' into gingerbread-plus-aosp

* commit '2c2ce8e53f5eb94916a5d0f40b2877cc7551870d':
  Added support for audio sessions in MediaPlayer and AudioTrack.
 2010-06-22 18:32:17 -07:00
Eric Laurent
dc872f5ec5 Merge "Added support for audio sessions in MediaPlayer and AudioTrack." into gingerbread 2010-06-22 18:29:57 -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
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