298 Commits

Author SHA1 Message Date
Joe Onorato
43a17654cf Remove the deprecated things from Config.java. These haven't been working since before 1.0.
Change-Id: Ic2e8fa68797ea9d486f4117f3d82c98233cdab1e
2011-04-07 19:23:05 -07:00
shailendra
88a14dcd1c am 6b49e9a8: am a450ef06: am ac390b8c: Merge "Fix for Media Server memory leak" into honeycomb-mr1
* commit '6b49e9a8829c87088dc7fbc0945237030e63327a':
  Fix for Media Server memory leak
2011-03-23 16:03:46 -07:00
shailendra
a450ef0668 am ac390b8c: Merge "Fix for Media Server memory leak" into honeycomb-mr1
* commit 'ac390b8cacc45c866ae2e60c0e492a914cf6ec78':
  Fix for Media Server memory leak
2011-03-23 15:47:47 -07:00
shailendra
ac390b8cac Merge "Fix for Media Server memory leak" into honeycomb-mr1 2011-03-23 15:33:51 -07:00
shailendra
2d06aee095 Fix for Media Server memory leak
bug - 4081123

Change-Id: Ic88c13f8006227cff2c91a31f5d1828d007125af
2011-03-22 21:30:35 -07:00
shailendra
35c654c3f5 am 8e0f2d71: am b819dcd4: am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1
* commit '8e0f2d71a1d2353228ba04562c8189f4904a11d1':
  Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
2011-03-22 11:54:44 -07:00
shailendra
b819dcd49d am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1
* commit '8483073ec21b5e2332deaad914eba1d087b1d1e3':
  Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
2011-03-22 11:50:15 -07:00
shailendra
8483073ec2 Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1 2011-03-22 11:48:12 -07:00
Yu Shan Emily Lau
8b17346a43 am 5460bb3e: am 112852b5: am 02109972: Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1
* commit '5460bb3e09766d45105dfb05f54f97da1dbc57a3':
  Add the mem logging into test utility. Bug# 4108259
2011-03-22 11:42:26 -07:00
Yu Shan Emily Lau
112852b577 am 02109972: Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1
* commit '0210997218fc22b77c71a43a2396419cd0a39166':
  Add the mem logging into test utility. Bug# 4108259
2011-03-21 18:00:32 -07:00
Yu Shan Emily Lau
0210997218 Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1 2011-03-21 17:32:17 -07:00
Eric Laurent
602b3286ff Fix issue 3509396: AudioEffect.getParameter JAVA.
Removed dead/buggy code in AudioEffect.getParameter() and
AudioEffect.command() that was meant to return the actual length of
meaningful data in the returned parameter or command reply.

This is replaced by the method return status indicating this length when
positive (negative return codes still indicate the same errors as before).

Modified automated AudioEffect tests accordingly.

Change-Id: Ie89617f912766b8dee73b81f92af9c48027c982d
2011-03-21 17:11:59 -07:00
Yu Shan Emily Lau
75afb97c4d Add the mem logging into test utility.
Bug# 4108259

Change-Id: Ifc8091490beef1430a1a0ab297e514b605da56f6
2011-03-18 13:27:51 -07:00
shailendra
0e898b59d8 am e21bbd24: am a5eaf2ea: am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
* commit 'e21bbd24a107c3286e8c6f3eca069ebb12ef13da':
  Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
2011-03-18 11:27:09 -07:00
shailendra
a5eaf2eae0 am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
* commit '0d922ec92dfe1d4adb6c66cdd2d3c16eb6b29776':
  Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
2011-03-18 11:02:35 -07:00
shailendra
d0c2813289 Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
Change-Id: I0a7081f901684ff7c7388b830afc6ae2f2ce7bcd
2011-03-18 10:45:29 -07:00
shailendra
c8b4efdd74 Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
Change-Id: Iab523e666c11b7f99aac71c761a4295d32ca026c
2011-03-17 14:53:20 -07:00
Yu Shan Emily Lau
f916a5537c am 0af00ebc: am 797f5b0c: am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into ho
* commit '0af00ebc178a90d53a2aba92b8f8c11cfca8c1f4':
  Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
2011-03-16 16:47:08 -07:00
Yu Shan Emily Lau
797f5b0c00 am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1
* commit 'fd5c1f7c575451cf3566d1a8290b0b001bddfa39':
  Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
2011-03-16 16:43:04 -07:00
Yu Shan Emily Lau
9dab784705 Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit.
Add the media test util for capturing the memory usage.
Bug# 4108259
Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
2011-03-16 16:36:17 -07:00
Iliyan Malchev
3070af0882 frameworks/base: remove LOCAL_PRELINK_MODULE
Change-Id: I54dd62ebef47e7690afa5a858f3cad941b135481
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-03-14 14:25:59 -07:00
Kenny Root
76d41f5796 am 206c62ed: am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"
* commit '206c62ed34dc8a48fd6c907d95456226949f42dd':
  Remove unnecessary SkImageDecoder_libjpeg.cpp
2011-03-14 11:49:56 -07:00
Chih-Wei Huang
4c1ac4e665 Remove unnecessary SkImageDecoder_libjpeg.cpp
Adding files outside $(LOCAL_PATH) is a bad idea. It generates output files
to an unexpected directory. In this case, it's

out/target/external/skia/src/images/SkImageDecoder_libjpeg.o

It's not in $(PRODUCT_OUT), which is not correct.
Worse, it makes the build system be unable to build different
architectures (arm and x86) simultaneously, since the output files
conflcit.

Seems we can just remove SkImageDecoder_libjpeg.cpp since it's
already in libskia.

Change-Id: Ia0ed72d8a6cbd3b2f3997b71dfdcf72fee50f5bb
2011-03-11 14:02:39 -08:00
Mike Lockwood
c72eb9113a Remove MtpClient class from framework and public API
After reviewing this class I decided it would be best not to include it in the public API
since it adds no functionality that cannot be done using MtpDevice and other APIs directly.
So I am moving it to the CameraBrowser sample instead.

Also changed CameraBrowser to build against the SDK to ensure all the necessary APIs for
PTP support have been made public.

Bug: 4067029

Change-Id: I585b06104084953176d018ced08bba0cb4607490
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-11 10:55:44 -05:00
Chih-Wei Huang
c2d68c9096 Remove unnecessary SkImageDecoder_libjpeg.cpp
Adding files outside $(LOCAL_PATH) is a bad idea. It generates output files
to an unexpected directory. In this case, it's

out/target/external/skia/src/images/SkImageDecoder_libjpeg.o

It's not in $(PRODUCT_OUT), which is not correct.
Worse, it makes the build system be unable to build different
architectures (arm and x86) simultaneously, since the output files
conflcit.

Seems we can just remove SkImageDecoder_libjpeg.cpp since it's
already in libskia.

Change-Id: I3e7533126ef60fe2fd424fdc777760e73c93489b
2011-03-10 17:52:31 +08:00
Mike Lockwood
c4308f01c9 Move USB framework support from android.hardware to android.hardware.usb package
Change-Id: I00fd4f0caaa4aebe48f71c576bb211b5f38bf88d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-01 08:07:20 -08:00
Mike Lockwood
e8be6a8d5b Merge "CameraBrowser: Add USB device filter meta-data for digital cameras" 2011-02-28 17:46:04 -08:00
Mike Lockwood
0fd3c4a1e2 CameraBrowser: Add USB device filter meta-data for digital cameras
This is used by the USB service to associate Gallery with PTP cameras.
Removed unnecessary broadcast receiver

Change-Id: Ifd78aa94f69cb7d6ec0b557313e90bb79812f15d
2011-02-28 17:26:06 -08:00
Yu Shan Emily Lau
4fdc6ebb91 Merge "Remove the hard coded media recorder test cases. Add the native heap dump catpure functionality." 2011-02-28 14:10:23 -08:00
Yu Shan Emily Lau
62f755ac65 Remove the hard coded media recorder test cases.
Add the native heap dump catpure functionality.

Change-Id: I434ff886152cbb9b2b9a4e39c75bfd016e0e50a0
2011-02-25 20:20:53 -08:00
Basavapatna Dattaguru
66d16910a8 Merge "VideoEditor: Issue:3396697: Update Perf and Stress test code" 2011-02-24 17:56:15 -08:00
Basavapatna Dattaguru
0c6a5182ed VideoEditor: Issue:3396697: Update Perf and Stress test code
Change-Id: Ifd90e8e1fdff1a04d47a3ae65813584cab78255c
2011-02-24 16:45:30 -08:00
Mike Lockwood
b607b884bd Merge "UsbManager: Remove redundant Intent extras from USB device and accessory broadcasts" 2011-02-24 14:05:02 -08:00
Glenn Kasten
cc562a3576 Bug 3438258 Add SurfaceTexture as MediaPlayer sink
This change enables the use of a SurfaceTexture in place of a Surface
as the video sink for an android.media.MediaPlayer. The new API
MediaPlayer.setTexture is currently hidden.

This includes:
 - New Java and C++ interfaces
 - C++ plumbing and implementation (JNI, Binder)
 - Stagefright AwesomePlayer and NuPlayer use ANativeWindow
   (either Surface or SurfaceTextureClient)

Change-Id: I2b568bee143d9eaf3dfc6cc4533c1bebbd5afc51
2011-02-23 15:02:56 -08:00
Mike Lockwood
188d00b07e UsbManager: Remove redundant Intent extras from USB device and accessory broadcasts
These extras are also accessable via the UsbDevice and UsbAccessory classes,
which are also included as extras.
Since you can't filter Intents based on extras there is no point in duplicating
this information as separate extras.

Change-Id: I4c8d1e70d66023a1800b3f8f06118898da6b37af
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-23 13:14:33 -08:00
Basavapatna Dattaguru
3ed54d03ee Merge "VideoEditor:IssueID:3396697: Added Performance test code" 2011-02-22 10:56:29 -08:00
Basavapatna Dattaguru
f1f9ff28c3 VideoEditor:IssueID:3396697: Added Performance test code
Updated with review comments: MediaFrameworkStressTestRunner.java deleted
Updated with growing heap report in Stress test case

Change-Id: I847f8810e2b844015c47b7d24e488a611d85287c
2011-02-18 18:42:56 -08:00
Basavapatna Dattaguru
c2b9eb88fd VideoEditor:IssueID:3396697: Updated Preview Test code
Change-Id: I895bcdbb0c65679b837e616de58e533a080bbf2f
2011-02-17 20:43:08 -08:00
Yu Shan Emily Lau
414e15309c Fixed the media playback report format.
Change-Id: I8b943f8cd914acc6c9ee81a71f0efbecece7263e
2011-02-17 15:51:56 -08:00
Yu Shan Emily Lau
ce6ff2c2e6 Update the summary output format which match the PM data posting.
Change-Id: I3e3f7313020da6d0d219acd90ac9edc8a4d0bce4
2011-02-17 12:10:17 -08:00
Yu Shan Emily Lau
85305f04d5 Change the media player stress test to repor the total number of failure and the total number of info.
Register the surface callback in the test application bug# 2909064

Change-Id: I3420b5bc81e276b50f612c126ed5fc1f4f16c08c
2011-02-16 12:24:34 -08:00
Basavapatna Dattaguru
0554f32afd VideoEditor:IssueID:3396697: Added Preview Test code
This has dependency on Ide5ee82b24806a52b4e612db4bc3c34f75e4465a
Removed trailing space in xml file
Removed dependency on test cases other than Preview & API

Change-Id: I835c0ca17d6ff15819407eb930cca8a08b095287
2011-02-14 20:59:51 -08:00
Basavapatna Dattaguru
046dc1ea81 Merge "VideoEditor: IssueID:3396697:Added TN,MP,Exp,API test codes" 2011-02-14 19:31:52 -08:00
Basavapatna Dattaguru
c0171d3e7b VideoEditor: IssueID:3396697:Added TN,MP,Exp,API test codes
Updated with review comments: code cleaning in MP.

Change-Id: Ide5ee82b24806a52b4e612db4bc3c34f75e4465a
2011-02-14 18:00:57 -08:00
Basavapatna Dattaguru
fc04c1d67e VideoEditor: Issue ID:3396697 Missing Files added
IMG_640x480_Overlay2: dimension correction done

Change-Id: I40960a44584fb27538d7e22829d293a34c654df7
2011-02-13 16:54:51 -08:00
Yu Shan Emily Lau
bd508bdbe4 Add the open source test media contents.
Change-Id: I956e06712454287f502bffb22e10612e980b936d
2011-02-11 15:47:00 -08:00
Basavapatna Dattaguru
4c030b5616 Merge "Video Editor CTS Test Code: annotation suppress" 2011-02-11 15:17:06 -08:00
Basavapatna Dattaguru
31d19c80c7 VideoEditor Test contents: Issue ID:3396697
Moved to folder contents/media_api/videoeditor

Change-Id: I809b684931130badca1c5bbf91178b142ba5017f
2011-02-11 15:00:17 -08:00
Basavapatna Dattaguru
86e9e9be1e Video Editor CTS Test Code: annotation suppress
Fix for Issue: ID:3396697
Updated with review comments

Change-Id: Ie20e60598f046b23ed49b2533e9d500607a23c17
2011-02-11 13:30:07 -08:00
Yu Shan Emily Lau
5d386a1ae2 Fix the build.
Change-Id: Ie02c5086c1dc8c4ef1c52c6ae43b018a48a18bdd
2011-02-07 21:18:00 -08:00