4167 Commits

Author SHA1 Message Date
James Dong
64a23430f9 Revert "Use pread() to get the decrypted data for container based DRM file."
This reverts commit a6f1104b9d829c636b60b9387e379f9667b5df09.
2011-05-25 12:17:33 -07:00
Jeffrey Tinker
ef89cc1495 Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 2011-05-23 18:10:10 -07:00
Jeffrey Tinker
8264641c98 Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
Fix for b/4198446 HC - Support for Widevine Adaptive VOD

Change-Id: Ia777c80825e3416bab6ae6273fba46a194135e60
2011-05-23 11:09:16 -07:00
James Dong
a5293d1ca4 Add some logging to track down where ANR happens during MediaPlayer._release().
o add a log message in AwesomePlayer::reset before acquiring the lock

Change-Id: I9f228f615f99c03c394e9d0dd78c855c0b9fcfbb
related-to-bug: 4409547
2011-05-23 09:36:31 -07:00
Gloria Wang
a6f1104b9d Use pread() to get the decrypted data for container based DRM file.
For bug 4392094.

Change-Id: Icc64a26c5b413313cc35dcd02d60484dc8245dfb
2011-05-20 10:15:21 -07:00
James Dong
d148a499c2 Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2 2011-05-18 16:06:14 -07:00
Gloria Wang
07e9267d33 Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2 2011-05-18 09:17:50 -07:00
Mike Lockwood
fbfe555125 StorageVolume: Add getStorageId() accessor
This ID is used for MTP as well as per volume querying in the media provider.

Change-Id: Ic4fc986d972bd477730643f7e9450c390c0b3a4b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-17 17:19:37 -04:00
Andreas Huber
c56e81c887 Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2 2011-05-17 10:29:36 -07:00
Dianne Hackborn
1e662c3294 Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 2011-05-16 12:54:22 -07:00
Dianne Hackborn
ac8dea12c1 DO NOT MERGE. Integrate from master: Rework display size access.
Applications now get the display size from the window manager.  No
behavior should be changed yet, this is just prep for some real
changes.

Change-Id: I47bf8b55ecd4476c25ed6482494a7bcc5fae45d2
2011-05-16 11:58:27 -07:00
Mike Lockwood
51690544aa MTP: Have GetStorageInfo command return correct storage type for removable storage
Change-Id: I09b548483c12080e7d77970babcae2eef379f2f4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-16 14:29:45 -04:00
Mike Lockwood
2f6a388553 StorageManager: Clean up and generalize storage configuration resources
Replace config_emulateExternalStorage, config_externalStorageRemovable,
config_externalStoragePaths, config_externalStorageDescriptions and
config_mtpReserveSpaceMegabytes resources with an XML resource file
to describe the external storages that are available.

Add android.os.storage.StorageVolume class

StorageManager.getVolumeList() now returns an array of StorageVolume

Change-Id: I06ce1451ebf08b82f0ee825d56d59ebf72eacd3d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-16 14:29:23 -04:00
Gloria Wang
331de5dd58 DO NOT MERGE
For bug 4422428
Squashed commit of the following:

commit ae2e13783db2284f40d3891e70e152dab941edfc
Author: Gloria Wang <gwang@google.com>
Date:   Fri May 13 11:43:11 2011 -0700

    Add one more DRM error code. For bug 4422428.

    Change-Id: I4e333f474c96c0e0f162dde4013ad32b336bebd6

commit 0f88249d0cb5221f622cf1d1ac3cdccefb8f58a2
Author: Gloria Wang <gwang@google.com>
Date:   Fri Apr 29 10:44:46 2011 -0700

    Add DRM errors in the DRM frameworks to MediaErrors also.
    For bug 4350156.

    Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394

Change-Id: Ia02de462159400eef8c015d28531bf1dd6796a18
2011-05-13 15:09:24 -07:00
Andreas Huber
77d8dc2b95 Using widevine:// to stream adaptive bitrate wvm content no longer
uses stagefright's http cache but defers caching to the WVMExtractor, which
now has the responsibility of reporting buffer status/duration.

Change-Id: Ieec64a20203977fd0a61d0c6834da124de78bfa2
related-to-bug: 4390283
2011-05-10 15:49:47 -07:00
The Android Automerger
158e3582c0 Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2 2011-05-08 22:11:52 -07:00
Scott Main
0cdd9f7def docs: add package description for mtp and a little more info to MtpDevice
Change-Id: I44b3926c4a286f624de525a7f0cc896879582bf5
2011-05-05 15:53:44 -07:00
Andreas Huber
b1071331c0 DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
Change-Id: Ie711ea8d6956fa8370c78e23bf795325627164d1
related-to-bug: 4381047
2011-05-04 15:12:02 -07:00
Mike Lockwood
c56ad54bd9 DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
This will prevent MediaProvider from adding these files to the images table

Change-Id: Ibc4128762f221b370a00e331aca633aafae0ad70
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:57 -04:00
Mike Lockwood
71b3342a58 DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
Don't let the "no media" status of one directory leak to the remaining files
and directories in the same parent.

Bug: 4364077

Change-Id: Ie756ccd06b1962b06143fc02a1a3927c3aba143a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:57 -04:00
Mike Lockwood
710a206445 DO NOT MERGE MTP: Implement GetThumb command
This allows the PC to access thumbnails in JPEG files over MTP/PTP

Bug: 3219495

Change-Id: Id61f353ba70e896fae9a47338bf7871c0f185d3e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:57 -04:00
Mike Lockwood
7fc3bebb5e DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
Change-Id: Ie0b979b5cfd9b5f9e9196c5f8c8ecccef6ed84c3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:57 -04:00
Mike Lockwood
371279f802 DO NOT MERGE MTP: Add extended operations to support in-place editing of files
MTP does not support partial writes of files (the entire file must be transferred at once).
This makes it impossible to implement a FUSE file system for MTP
with acceptable performance.
To fix this problem, this change adds extended MTP operations to allow
partial writes to files:

SendPartialObject - allows writing a subset of a file, or appending to the end of a file

TruncateObject - allows changing the size of a file

BeginEditObject - must be called before using SendPartialObject and TruncateObject

EndEditObject - commits changes to a file after it has been edited with SendPartialObject or TruncateObject

We also add GetPartialObject64, which is the same as GetPartialObject
but has a 64 bit offset rather than 32.

Change-Id: Id5365e1c4dc55a2d819c16c9db0a3ac2260f9309
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:56 -04:00
Mike Lockwood
9c112a86de DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
Previously we ignored any files and directories that had name started with '.'
and ignored any directories that contained a ".nomedia" file.
Now to support transferring any file via MTP, we now add these previously ignored files
to the media database, but will not mark them as audio, video, image or playlist files.
That way they will be included in the files table but will be hidden from the
audio, video, images and playlist views that are used by apps like Music and Gallery.

Bug: 3405327

Change-Id: Ibb37bb2856a0684ce9f685ed565ad35347622834
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:56 -04:00
Marco Nelissen
1cf74fb3c4 DO NOT MERGE Fix media scanner uri handling.
If a file was originally considered a video file (because it had
a .mp4 extension, for example), but was then discovered to have
only an audio track, it would update the type, but not the URI
for insertion into the media provider.

Change-Id: I25652a031b98d2ec2433263dd6f344ba90d2d112
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:56 -04:00
Mike Lockwood
7ae938be1b DO NOT MERGE MTP and media provider support for multiple storage devices:
- MTP support for multiple storage units

- Add storage_id column to media database for MTP storage ID

- Add framework resource for defining mount points and user visible descriptions
for multiple volumes

- Clean up locking in MtpServer JNI code

Change-Id: Ide6d47bd9aa1698ed2a13d695613e03f2a9b29e3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:56 -04:00
James Dong
ec78f551b5 Add avg bandwidth estimate every 2 seconds - do not merge.
This patch is meant for testing only.
We will remove this patch once we tracked down all those spinning issues.

related-to-bug: 4339075

Change-Id: I4cf1927f1067d4f7dbc589ceb3c47407eaf40ae7
2011-04-28 17:16:03 -07:00
Glenn Kasten
b0d6f10eed Bug 4167061 remove debugging code
Change-Id: I1cb46a7bbf885c72e75d32f3f7675d90ab611e85
2011-04-13 11:16:49 -07:00
Glenn Kasten
c6c2285b36 Enable HDCP debugging in Stagefright (1 of 2)
Change-Id: Ia3ea555d5fa45547ed6bfce59f299087ced7809c
2011-04-11 11:07:53 -07:00
Jamie Gennis
66380f768c Stagefright: authenticate ANativeWindow.
This change adds a check to verify that the ANativeWindow to which
decoded video buffers are queued sends those buffers to SurfaceFlinger.
The check is done when the buffer content is flagged as protected.  This
change also adds an error in the case where protected buffers are
needed, but an ANativeWindow is not being used as the video destination.

Change-Id: I107c9082d65ef0de4a13594e9535a2053ad5161b
Bug: 4269240
2011-04-08 15:24:10 -07:00
Mike Lockwood
11dd5ae97b Improve Javadoc for USB Manager and MTP/PTP support.
Bug: 4091519

Change-Id: Ida79593d5a984f7ffd0934ae7bded23b8faf9eef
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-04-01 14:11:50 -04:00
Glenn Kasten
ffa670b5b0 Bug 4167061
Change-Id: I9bf7c0f9387ad23501261b8c2d10fa6fdaba8aef
2011-03-30 18:50:41 -07:00
Andreas Huber
b676b73e39 Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 2011-03-30 15:16:36 -07:00
Andreas Huber
45ad57aab3 When http streaming and Content-Length is unknown, make sure to return all
data that we successfully received before signalling the error.

Change-Id: I7e60602d41b4df85aa85e413c590687305e9bbce
related-to-bug: 4190765
2011-03-30 15:00:34 -07:00
Andreas Huber
b13c4a9b6c Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
Change-Id: Ib493572c614dbb74fa23b13c3e43899e3b31cf0e
related-to-bug: 4147205
2011-03-29 10:00:20 -07:00
Andreas Huber
2edbdcc6f2 Merge "After a seek there's a brief period where audio time isn't reestablished." into honeycomb-mr1 2011-03-28 08:11:26 -07:00
Andreas Huber
59529e1474 After a seek there's a brief period where audio time isn't reestablished.
Don't use audio time to trigger a "we're very late, skipping ahead" action
until it's reestablished.

Change-Id: Ia8534e5bed60203d49a457d14b2e55eb972b5fa1
related-to-bug: 4173683
2011-03-25 16:40:50 -07:00
Andreas Huber
16ede3c535 Make sure we post a video event when seeking after seeing video EOS before.
Change-Id: I513bf94c0732a85324160977ea5723d8aafd6aba
related-to-bug: 3316960
2011-03-25 14:47:38 -07:00
James Dong
3be1593628 Switch to use SF cached source
bug - 3500025

Change-Id: I96c416d39af498f091d2d52f5923f556382a9c1f
2011-03-25 08:41:57 -07:00
Glenn Kasten
0b1b2a3212 Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1 2011-03-23 17:03:46 -07:00
Glenn Kasten
1b11b64bb6 Bug 4159373 Use HDCP debug settings
Change-Id: Iefc0a0d4b574ee94fbc83bf74b57c1d3465c821c
2011-03-23 16:08:18 -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
8483073ec2 Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1 2011-03-22 11:48:12 -07:00
Andreas Huber
453c0d5f16 Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1 2011-03-22 08:37:58 -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
Andreas Huber
8505f2fe1e DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
Change-Id: Ic683201dcfcd11fb4bccfeefc63427a4c9bfabb4
related-to-bug: 4148291
2011-03-21 16:45:25 -07:00
Andreas Huber
e2c32e9f96 If nothing is to be copied, return right away.
This avoids a potential out-of-bounds problem in the code below.

Change-Id: I942d55da0a5288b37512cb74407f900a2d824c0c
related-to-bug: 4139974
2011-03-21 14:16:03 -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
d0c2813289 Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
Change-Id: I0a7081f901684ff7c7388b830afc6ae2f2ce7bcd
2011-03-18 10:45:29 -07:00