drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,150 Commits 1 Branch 0 Tags
Commit Graph

499 Commits

Author SHA1 Message Date
Dianne Hackborn
74468de20b am 9d31e1be: Merge change 26686 into eclair 
Merge commit '9d31e1bebaf3ae5d54751c32466edcea6e7433dd' into eclair-plus-aosp

* commit '9d31e1bebaf3ae5d54751c32466edcea6e7433dd':
  Fix broken build.
 2009-09-23 15:28:53 -07:00
Dianne Hackborn
a52b4d764e Fix broken build. 
I -did- run it...  why did this later break on me?!?

Change-Id: I70db0279f9a1b499496f9808525d2b112495d6c7
 2009-09-23 15:17:39 -07:00
Ray Chen
94cdc3d0e2 am 830207ca: Merge change 25635 into eclair 
Merge commit '830207cab4047431d7a38443531a3a912bfecf3a' into eclair-plus-aosp

* commit '830207cab4047431d7a38443531a3a912bfecf3a':
  Add new thumbnail API.
 2009-09-23 11:38:06 -07:00
Ray Chen
00c575a3fc Add new thumbnail API. 2009-09-23 11:23:45 -07:00
Yu Shan Emily Lau
5653e41e71 am 008fc5d1: Merge change 26332 into eclair 
Merge commit '008fc5d142b58688a3827a544c524dff11204c62' into eclair-plus-aosp

* commit '008fc5d142b58688a3827a544c524dff11204c62':
  1) Add the wma / wmv profile reader.
 2009-09-22 12:32:29 -07:00
Android (Google) Code Review
008fc5d142 Merge change 26332 into eclair 
* changes:
  1) Add the wma / wmv profile reader. 2) Add the flag which check the wma/wmv enable properties. If the codec is not enable, then skip the wma / wmv related test cases. 3) Added a workaround which let the testcodecspecific test case continue even though there is a failure in the middle of the test. Besides, take out the remvoeFile for temporary usage.
 2009-09-22 15:09:33 -04:00
Yu Shan Emily Lau
dc1af5befa 1) Add the wma / wmv profile reader. 
2) Add the flag which check the wma/wmv enable properties. If the codec is not enable, then skip the wma / wmv related test cases.
3) Added a workaround which let the testcodecspecific test case continue even though there is a failure in the middle of the test. Besides, take out the remvoeFile for temporary usage.
 2009-09-22 10:52:56 -07:00
Chih-Chung Chang
1e577ced7d am 7b7029e0: Merge change 26236 into eclair 
Merge commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6' into eclair-plus-aosp

* commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6':
  Make media scanner read the jpeg orientation tag.
 2009-09-22 09:59:46 -07:00
Chih-Chung Chang
b8f4725d1b Make media scanner read the jpeg orientation tag. 2009-09-22 04:42:02 +08:00
Yu Shan Emily Lau
58c243450d am 92b27daf: Merge change 25858 into eclair 
Merge commit '92b27dafe9418c5fdf63d23c6b19772fbcd74676' into eclair-plus-aosp

* commit '92b27dafe9418c5fdf63d23c6b19772fbcd74676':
  There is a know issue in PV regarding the video size return. Need to put a 1 second sleep before we get the video dimension
 2009-09-18 20:13:31 -07:00
Android (Google) Code Review
92b27dafe9 Merge change 25858 into eclair 
* changes:
  There is a know issue in PV regarding the video size return. Need to put a 1 second sleep before we get the video dimension
 2009-09-18 23:07:00 -04:00
Yu Shan Emily Lau
17d7ea4947 There is a know issue in PV regarding the video size return. Need to put a 1 second sleep before we get the video dimension 2009-09-18 16:27:24 -07:00
Yu Shan Emily Lau
5813b30974 am e785d180: Merge change 25826 into eclair 
Merge commit 'e785d1804dbf67913aeb25896a420abebe731e80' into eclair-plus-aosp

* commit 'e785d1804dbf67913aeb25896a420abebe731e80':
  Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore.
 2009-09-18 16:23:06 -07:00
Android (Google) Code Review
e785d1804d Merge change 25826 into eclair 
* changes:
  Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore.
 2009-09-18 19:14:32 -04:00
Yu Shan Emily Lau
9d7b2fa808 Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore. 2009-09-18 14:58:56 -07:00
Chih-Chung Chang
8701202834 am f22b7410: Merge change 25464 into eclair 
Merge commit 'f22b74103a2ea2fecdb80deb6a0baffa84e66776' into eclair-plus-aosp

* commit 'f22b74103a2ea2fecdb80deb6a0baffa84e66776':
  Improve ExifInterface API.
 2009-09-18 12:02:50 -07:00
Chih-Chung Chang
872a30ec72 Improve ExifInterface API. 
Change-Id: Ic6c4df8244b51b9a0d1c73c3797847220d86604d
 2009-09-18 11:30:47 -07:00
Yu Shan Emily Lau
667bc1e862 am b39dcb79: Merge change 25722 into eclair 
Merge commit 'b39dcb796ddf40fb87724ac28932a687756c91bd' into eclair-plus-aosp

* commit 'b39dcb796ddf40fb87724ac28932a687756c91bd':
  Modified the validation to use singal media player instance.
 2009-09-18 00:00:05 -07:00
Yu Shan Emily Lau
bc95d663ad Modified the validation to use singal media player instance. 2009-09-17 23:43:18 -07:00
Yu Shan Emily Lau
64ea3d3fd8 am 56af9e9f: Merge change 25452 into eclair 
Merge commit '56af9e9f9cbc3626acf55558d581efd2de3caa03' into eclair-plus-aosp

* commit '56af9e9f9cbc3626acf55558d581efd2de3caa03':
  Modified the new stream video url.
 2009-09-17 23:28:09 -07:00
Android (Google) Code Review
56af9e9f9c Merge change 25452 into eclair 
* changes:
  Modified the new stream video url.
 2009-09-18 02:20:43 -04:00
Andreas Huber
b66fb49883 am 3065a3ca: Merge change 25528 into eclair 
Merge commit '3065a3cad069b847165c99a38a251c072950d07f' into eclair-plus-aosp

* commit '3065a3cad069b847165c99a38a251c072950d07f':
  Another stagefright test-case and ignore end-of-stream notifications while we're flushing.
 2009-09-17 12:00:45 -07:00
Android (Google) Code Review
3065a3cad0 Merge change 25528 into eclair 
* changes:
  Another stagefright test-case and ignore end-of-stream notifications while we're flushing.
 2009-09-17 14:46:45 -04:00
Andreas Huber
1a77b68e90 Another stagefright test-case and ignore end-of-stream notifications while we're flushing. 2009-09-17 11:16:52 -07:00
Yu Shan Emily Lau
00e6beb6ea am c82e65ae: Merge change 25228 into eclair 
Merge commit 'c82e65aed57592d40009a9695f513ebf402e687c' into eclair-plus-aosp

* commit 'c82e65aed57592d40009a9695f513ebf402e687c':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
 2009-09-17 08:45:01 -07:00
Yu Shan Emily Lau
208ad8e413 Modified the new stream video url. 2009-09-16 23:16:44 -07:00
Android (Google) Code Review
c82e65aed5 Merge change 25228 into eclair 
* changes:
  	modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java Added the error callback to handle the media server crash.
 2009-09-16 22:16:58 -04:00
Jean-Baptiste Queru
e525eef4b8 merge from open-source master 2009-09-16 16:22:13 -07:00
Jean-Baptiste Queru
ea5f767246 Update documentation for getVideoWidth and getVideoHeight. 
Ref: http://code.google.com/p/android/issues/detail?id=3024
 2009-09-16 15:06:25 -07:00
Chih-Chung Chang
d5423a9fc8 am fc5f1026: Merge change 25291 into eclair 
Merge commit 'fc5f10265fd676c14554a3c85fb665dfed5efe70' into eclair-plus-aosp

* commit 'fc5f10265fd676c14554a3c85fb665dfed5efe70':
  Try to fix sdk build again.
 2009-09-16 10:32:14 -07:00
Android (Google) Code Review
fc5f10265f Merge change 25291 into eclair 
* changes:
  Try to fix sdk build again.
 2009-09-16 13:23:35 -04:00
Chih-Chung Chang
8bc2495e5e am de88c515: Merge change 25286 into eclair 
Merge commit 'de88c515ce3ba2ca15cfeff632ef80d01bfac4df' into eclair-plus-aosp

* commit 'de88c515ce3ba2ca15cfeff632ef80d01bfac4df':
  Fix sdk build.
 2009-09-16 10:22:56 -07:00
Chih-Chung Chang
9081aec61f Try to fix sdk build again. 2009-09-17 01:20:05 +08:00
Android (Google) Code Review
de88c515ce Merge change 25286 into eclair 
* changes:
  Fix sdk build.
 2009-09-16 13:15:45 -04:00
Chih-Chung Chang
7b886f9e8c Fix sdk build. 2009-09-17 01:09:08 +08:00
Andreas Huber
51173401f4 am f7c3679f: Merge change 25158 into eclair 
Merge commit 'f7c3679f898cdcb208bc1675c79573e1d637083a' into eclair-plus-aosp

* commit 'f7c3679f898cdcb208bc1675c79573e1d637083a':
  Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565.
 2009-09-16 10:08:13 -07:00
Android (Google) Code Review
f7c3679f89 Merge change 25158 into eclair 
* changes:
  Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565.
 2009-09-16 13:01:57 -04:00
Chih-Chung Chang
53a673661c am d3ba4811: Merge change 25272 into eclair 
Merge commit 'd3ba4811d48e01e85b4faa57da159471022e6daa' into eclair-plus-aosp

* commit 'd3ba4811d48e01e85b4faa57da159471022e6daa':
  Make ExifInterface public.
 2009-09-16 09:19:41 -07:00
Android (Google) Code Review
d3ba4811d4 Merge change 25272 into eclair 
* changes:
  Make ExifInterface public.
 2009-09-16 12:12:03 -04:00
Jean-Michel Trivi
2edbd217af am b53eaac6: Merge change 25155 into eclair 
Merge commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8' into eclair-plus-aosp

* commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8':
  Fix bug 2115258 where the AudioManager javadoc doesn't warn against
 2009-09-16 09:10:31 -07:00
Android (Google) Code Review
b53eaac659 Merge change 25155 into eclair 
* changes:
  Fix bug 2115258 where the AudioManager javadoc doesn't warn against misuse of some of the methods that should only be used to implement the Settings and Phone apps, and the audio service.
 2009-09-16 12:07:37 -04:00
Chih-Chung Chang
017bb4ccf7 Make ExifInterface public. 2009-09-16 23:38:34 +08:00
Chih-Chung Chang
e1c64f8f14 am ccd064d4: Merge change 25255 into eclair 
Merge commit 'ccd064d4117bef3fc2a0914f03ccc84a1b50aaa1' into eclair-plus-aosp

* commit 'ccd064d4117bef3fc2a0914f03ccc84a1b50aaa1':
  Clean ExifInterface. Prepare to make it public.
 2009-09-16 05:21:54 -07:00
Chih-Chung Chang
700beb4846 Clean ExifInterface. Prepare to make it public. 
Change-Id: Ibff719d02f525c1e8583d1892737224a0cc42c37
 2009-09-16 20:03:48 +08:00
Yu Shan Emily Lau
20a6b955fe modified: MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java 
Added the error callback to handle the media server crash.

	modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java
 2009-09-15 21:42:07 -07:00
Yu Shan Emily Lau
036033fc6d am 610e3595: modified: MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java Fixed the meta data duration 
Merge commit '610e3595d250f78c857126cd08ef2a82ee650415' into eclair-plus-aosp

* commit '610e3595d250f78c857126cd08ef2a82ee650415':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
 2009-09-15 20:59:10 -07:00
Yu Shan Emily Lau
610e3595d2 modified: MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java 
Fixed the meta data duration
 2009-09-15 20:40:07 -07:00
Andreas Huber
39b3bb95a7 am 781a5dd5: Merge change 25142 into eclair 
Merge commit '781a5dd5279b7a57c2c0b1d78cb2a4e7acbf1715' into eclair-plus-aosp

* commit '781a5dd5279b7a57c2c0b1d78cb2a4e7acbf1715':
  The 8k chipset qcom decoders require that the input buffers be allocated using OMX_AllocateBuffer rather than OMX_UseBuffer for now.
 2009-09-15 16:19:35 -07:00
Andreas Huber
4f23457958 Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565. 2009-09-15 16:19:08 -07:00
Jean-Michel Trivi
fccb25d207 Fix bug 2115258 where the AudioManager javadoc doesn't warn against 
misuse of some of the methods that should only be used to implement
the Settings and Phone apps, and the audio service.
 2009-09-15 16:13:59 -07:00