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

241 Commits

Author SHA1 Message Date
Basavapatna Dattaguru
90982936a0 am 89378fd1: Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb 
* commit '89378fd1666cd589599a0c5a7d0c71fa2f8159a5':
  Revert "Video editor CTS: Framework modifications"
 2011-01-26 22:52:38 -08:00
Basavapatna Dattaguru
141a2adb25 am 3b728ca7: Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb 
* commit '3b728ca70a4fe6760b682589505d76848c47d765':
  Revert "Fixes Issue ID: 3396697"
 2011-01-26 22:52:31 -08:00
Basavapatna Dattaguru
3b728ca70a Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb 2011-01-26 22:50:50 -08:00
Basavapatna Dattaguru
d36b1f0739 Revert "Video editor CTS: Framework modifications" 
This reverts commit eb6d6ecf4ba7a3965ce6ab178dce48eb9416bfc7.
 2011-01-26 22:38:47 -08:00
Basavapatna Dattaguru
4b9969af57 Revert "Fixes Issue ID: 3396697" 
This reverts commit 8b9ba616444a265df6cd2b4f4a0a39d808c65ade.
 2011-01-26 22:36:10 -08:00
Basavapatna Dattaguru
a33537c3f1 am 9af5da52: Merge "Video editor CTS: Framework modifications" into honeycomb 
* commit '9af5da5258d14c743150318e9887b7d10c0117d4':
  Video editor CTS: Framework modifications
 2011-01-26 21:51:49 -08:00
Basavapatna Dattaguru
55bf9bdbcb am 643e8476: Merge "Fixes Issue ID: 3396697" into honeycomb 
* commit '643e8476e1b9da93a06d073797863298ae268393':
  Fixes Issue ID: 3396697
 2011-01-26 21:49:34 -08:00
Basavapatna Dattaguru
9af5da5258 Merge "Video editor CTS: Framework modifications" into honeycomb 2011-01-26 21:48:02 -08:00
Basavapatna Dattaguru
eb6d6ecf4b Video editor CTS: Framework modifications 
Fixes Issue ID: 3396697

Copyright changed to 2011

Change-Id: I1b69c6903bb6b0434eb93337783f93c92fd20899
 2011-01-26 20:58:56 -08:00
Basavapatna Dattaguru
8b9ba61644 Fixes Issue ID: 3396697 
Updated with annotation LargeTest

Copyright changed to 2011

Review reworked and with new test contents

Video Editor CTS Test code

Change-Id: Ia37956ef39fafcc5d969996c1791fce8663aa0fe
 2011-01-26 20:31:11 -08:00
James Dong
999fb5a5a9 am 068b41d5: Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb 
* commit '068b41d5d41a4a78c96586b85ea89d464d302548':
  Publish MediaMetadataRetriever.java as public API
 2011-01-12 14:35:35 -08:00
James Dong
11eab056dd Publish MediaMetadataRetriever.java as public API 
o Removed setMode() methods and related mode constants
o Removed some of the unused the metadata keys
o Updated the javadoc

o part of a multi-project change.

bug - 2433195

Change-Id: I5ed167f1fd6a53cb143b7dc385b149431d434438
 2011-01-12 14:14:11 -08:00
Yu Shan Emily Lau
513f3ab050 am 5619da8d: am 2af4e71d: Merge "Fix the test application orientation. Bug# 3205196" into gingerbread 
* commit '5619da8d8b66337db182a016619efa1f31266a78':
  Fix the test application orientation. Bug# 3205196
 2011-01-11 14:21:59 -08:00
Mike Lockwood
65d2a4cb5f Remove CameraBrowser test app 
Change-Id: I7e04ef674746c5c2cdf421a2b9ec440d7ea831bd
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-06 11:47:25 -05:00
Yu Shan Emily Lau
d97943d5d0 Fix the test application orientation. Bug# 3205196 
Change-Id: I57085d6507482ce15dbf3b167965be4af43b3d88
 2011-01-04 20:57:09 -08:00
James Dong
df9b349b96 Replace extractAlbumArt() with getEmbeddedPicture() in MediaMetadataRetriever.java 
Change-Id: I34dfc1daa3bed1f334f3f266cbe70d1e3d7924f6
 2011-01-04 15:03:48 -08:00
Mike Lockwood
0cd0136d44 Move MTP Java classes to android.mtp.* package. 
Change-Id: Ib18bcaabf314241a95e517d0b93be5845d988e2c
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-12-30 11:54:33 -05:00
Mike Lockwood
4453aa4c30 CameraBrowser: Catch ActivityNotFoundException when attempting to display imported file. 
Change-Id: I448f2506caf0a5599c885654fd0078beb6240965
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-12-14 23:38:43 -08:00
Mike Lockwood
770126a678 Rename android.hardware.Usb to UsbManager and UsbObserver to UsbService 
In preparation for an upcoming change that will make UsbService into a real system service

Change-Id: Id85d624cfc6b10b49a08105cfaaacc667a492c12
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-12-09 22:52:05 -08:00
Mike Lockwood
485059de22 CameraBrowser: Give it ACCESS_USB permission, which is now required for PTP 
Change-Id: Ic5c7810ff4b7e25ba5f49a1107f5121391943108
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-12-09 11:45:44 -08:00
James Dong
25d7094279 Log the exception cause for better problem analysis 
Change-Id: Ia1f81adb6fc3be87098c9399509b68d5daf7f2da
 2010-12-06 14:41:00 -08:00
Yu Shan Emily Lau
28bec9ebce Merge "Suppress the unsupported camera recording size (ie QVGA and SQVGA)" 2010-12-06 10:14:16 -08:00
Yu Shan Emily Lau
e8f317d32c Suppress the unsupported camera recording size (ie QVGA and SQVGA) 
Change-Id: I34b6433f0aae4a117b2467069523a62e44bf9bbe
 2010-12-03 19:32:25 -08:00
James Dong
f6bd1ea0c7 Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime() 
as part of the preparation for publishing MediaMetadataRetriever as public Java API

bug - 2433195

Change-Id: I6e8a771347e3d89bfe359ae403ebfe3205ea6313
 2010-12-03 17:14:25 -08:00
James Dong
7411c1b836 Renable the captureFrame unit tests 
o We need to make sure that
  /sdcard/media_api/metadata rwx to the test app
  before tests

Change-Id: Iaa2d58bb2d380bf7e93ec71f77c4c769d65b1d85
 2010-11-29 12:59:39 -08:00
Mike Lockwood
a31560598a Rename android.provider.Mtp to android.provider.Ptp 
We are only supporting the PTP subset of MTP in host mode and have
no plans for full MTP, so calling it Mtp was misleading.

Also moved ACTION_MTP_SESSION_END Intent name to android.provider.MediaStore
and added it to the public API.

Change-Id: Ie35d15864d5972e65a39b982aa51316ecca3725a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-23 10:30:31 -05:00
James Dong
86e735375e Merge "Fixed MediaPlayer unit test issues" 2010-11-19 17:35:26 -08:00
James Dong
f360acf875 Fixed MediaPlayer unit test issues 
o We used to have two different "idle" state with OpenCore.
  Now, with SF, we have a single and consistent "idle" state.

bug - 3198642

Change-Id: I2bbb5e8b6c2d8166841a6e99a1c2c4a47e00b574
 2010-11-19 16:56:02 -08:00
Mike Lockwood
af8632ccb4 CameraBrowser: temporarily move to system partition 
Change-Id: Ied871109f98bdeba7456aacefc537d70a81ee8c9
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-19 17:53:03 -05:00
Mike Lockwood
1d5dedc9e4 CameraBrowser improvements: 
Replace menu for importing and deleting files with buttons.

Automatically close activities when camera is disconnected.

Change-Id: I88351e7c337c796057ce3f7da46fc287305f2220
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-19 15:28:36 -05:00
Mike Lockwood
49fd5d9957 Remove command line mtp host tool 
I don't need this any more, and don't have time to finish nor maintain it.

Change-Id: I35c5d003e1ad163d429832eb1d0c8d880058c7f1
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-19 12:24:03 -05:00
Mike Lockwood
954c267725 PTP: Improve performance and reliability of file importing 
Now the file copy is done completely within the media process
rather than pushing data to the client via ContProvider.openFile().

File system writes are now interleaved with USB reads, which allows us
to copy the data faster and prevents the camera from timing out during transfer.

File is automatically inserted in the media provider after a successful import
and a Uri is returned to the client.

BUG: 2994234

Change-Id: Ie75c63da76f623343d3d966c6a707aa1ae871972
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-19 11:30:10 -05:00
James Dong
b1262a8b1d 64-bit file size/offset support for media framework 
Change-Id: I3452bc2c0f1d990cc67285df2fce1f9f86ff8e10
 2010-11-18 14:12:24 -08:00
Andreas Huber
c23dabfb20 Remove all traces of legacy renderer support in stagefright. 
Change-Id: I17b8e0dbf53fca37c96830c41131b4bc0c24ca6d
 2010-11-16 13:05:53 -08:00
James Dong
98d50a0be8 Merge "Disable flaky streaming server check" 2010-11-15 08:13:30 -08:00
James Dong
2fd4e5935c Fix a typo in LOG_TAG for MediaPlayer unit tests 
Change-Id: I351f32fe4b4da82c32acf5c9e5ebdb81bb003525
 2010-11-14 14:56:56 -08:00
James Dong
a76e7efde8 Disable flaky streaming server check 
o Although the streaming server is available, the check fails most of the time.

Change-Id: I1084e715605541c4fc3d40e4055db90ddb118b6f
 2010-11-13 15:22:55 -08:00
James Dong
c5d4730ed1 Fix testWAVSeekToEnd() testcase 
The testcase does not depend on the availability of WMV decoder

Change-Id: I983f6d5954242a28fb9818fa03447b4afe7ad3d1
 2010-11-11 00:03:59 -08:00
Yu Shan Emily Lau
0af3cfc6f3 am 751cc424: am 8b023a2e: Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread 2010-10-27 11:58:58 -07:00
Yu Shan Emily Lau
93aa00c664 Add the mediaplayer release in the test validation. This is to ensure the media player release properly. 
Change-Id: Ia4758a3c549b64b6efead18e7538d977dee2be76
 2010-10-26 14:36:09 -07:00
Jean-Baptiste Queru
5582cc3a68 Merge fb474872 from gingerbread-plus-aosp 
Change-Id: I1bbb845a86a7b7df44ea175df3af22e5f47c44e3
 2010-10-18 08:33:38 -07:00
Eric Laurent
2cd55d2f6d am 83ed30e5: am ae0bb04a: Merge "Fix issue 3098850" into gingerbread 
Merge commit '83ed30e5e7aab370400657bcdafde2f071de0b54'

* commit '83ed30e5e7aab370400657bcdafde2f071de0b54':
  Fix issue 3098850
 2010-10-16 08:59:37 -07:00
Andreas Huber
a4f391c9bf Include the framework copy of the OpenMAX headers instead of referencing external/opencore. 
Change-Id: I762f59acf5e1f770e4d7c2d89af362bfffebefa6
related-to-bug: 3101573
 2010-10-15 13:31:29 -07:00
Eric Laurent
02d0ff60c4 Fix issue 3098850 
Media framework test permissions were not updated when commit
14beea487c065ca902bfd7089399eb71a805e302 added
MODIFY_AUDIO_SETTINGS permission check for global effects.

Change-Id: I2a97be74f33d62fbb749642b1e7a26ddf92378f2
 2010-10-14 17:12:43 -07:00
Jeff Brown
3caf37eb32 am f358cecb: am 79a3981e: Fix Looper leaks in MediaRecorderStressTest. 
Merge commit 'f358cecb9cb2853ba0d6f54f350a92b1b5e247b2'

* commit 'f358cecb9cb2853ba0d6f54f350a92b1b5e247b2':
  Fix Looper leaks in MediaRecorderStressTest.
 2010-10-06 17:07:49 -07:00
Jeff Brown
79a3981e38 Fix Looper leaks in MediaRecorderStressTest. 
The test was failing periodically due to too many files being open.
This change attempts to resolve the problem on the theory that
signaling pipe file descriptors are being leaked due to the large
number of Looper instances created during the test run.

However, it's still possible there are other leaks elsewhere.

Change-Id: I71f9f12d21605c47c9217c72c51e6c768142ce10
 2010-10-04 21:01:29 -07:00
Mike Lockwood
ac745c1c6b MTP: Fix some warnings 
Change-Id: I1302cacd1df885c770332cecaaea9f7c8ab97b88
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-25 21:38:13 -04:00
Mike Lockwood
58fd98accb Add constant for SDCARD_RW group ID. 
Change-Id: I3b009cd06d3c1bc308ba82694db7383134709f75
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-24 11:02:47 -04:00
Eric Laurent
bb7684bafa resolved conflicts for merge of ac4a284a to master 
Change-Id: Ia644f67b5d7d7e7137eef2284e9533b5819c12d8
 2010-09-23 12:22:44 -07:00
Eric Laurent
1a5149e5d7 Fix issue 3022800. 
- Created sub-package android.media.audiofx for audio effects.
- Hid AudioEffect class contructor, methods and variables not needed by
applications
- Added more javadoc comments for AudioEffect Class

Change-Id: Ibbb40d4e714bb248aa32cf82d7763d74efae96d1
 2010-09-23 11:04:03 -07:00