summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use pread() to get the decrypted data for container based DRM file.Gloria Wang2011-05-201-0/+7
| | | | | | For bug 4392094. Change-Id: Icc64a26c5b413313cc35dcd02d60484dc8245dfb
* Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" ↵James Dong2011-05-184-29/+155
|\ | | | | | | into honeycomb-mr2
| * Using widevine:// to stream adaptive bitrate wvm content no longerAndreas Huber2011-05-104-29/+155
| | | | | | | | | | | | | | | | 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
* | Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into ↵Gloria Wang2011-05-184-17/+28
|\ \ | | | | | | | | | honeycomb-mr2
| * | DO NOT MERGEGloria Wang2011-05-134-17/+28
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "DO NOT MERGE: Properly construct the ESDS metadata even if ↵Andreas Huber2011-05-171-1/+7
|\ \ | | | | | | | | | sizeof(codec-specific-data) != 2" into honeycomb-mr2
| * | DO NOT MERGE: Properly construct the ESDS metadata even if ↵Andreas Huber2011-05-041-1/+7
| |/ | | | | | | | | | | | | sizeof(codec-specific-data) != 2 Change-Id: Ie711ea8d6956fa8370c78e23bf795325627164d1 related-to-bug: 4381047
* | MTP: Have GetStorageInfo command return correct storage type for removable ↵Mike Lockwood2011-05-162-4/+8
|/ | | | | | | storage Change-Id: I09b548483c12080e7d77970babcae2eef379f2f4 Signed-off-by: Mike Lockwood <lockwood@android.com>
* DO NOT MERGE MediaScanner: Fix bug in "no media" handling logicMike Lockwood2011-05-031-3/+4
| | | | | | | | | | 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>
* DO NOT MERGE MTP: Implement GetThumb commandMike Lockwood2011-05-035-1/+34
| | | | | | | | | 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>
* DO NOT MERGE MTP: Fix file descriptor leak in file editing extensionsMike Lockwood2011-05-032-24/+29
| | | | | Change-Id: Ie0b979b5cfd9b5f9e9196c5f8c8ecccef6ed84c3 Signed-off-by: Mike Lockwood <lockwood@android.com>
* DO NOT MERGE MTP: Add extended operations to support in-place editing of filesMike Lockwood2011-05-035-8/+268
| | | | | | | | | | | | | | | | | | | | | | 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>
* DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding ↵Mike Lockwood2011-05-032-16/+13
| | | | | | | | | | | | | | | | 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>
* DO NOT MERGE MTP and media provider support for multiple storage devices:Mike Lockwood2011-05-034-8/+9
| | | | | | | | | | | | | | - 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>
* Add avg bandwidth estimate every 2 seconds - do not merge.James Dong2011-04-282-0/+12
| | | | | | | | | 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
* Add heartbeat error codes into MediaErrors.hGloria Wang2011-04-261-0/+11
| | | | | | related-to-bug: 4322415 Change-Id: I78137c61e3a8ce9afcb9fb38cb77a83561b9b72d
* Fix issue 4335692: HDMI media volumeEric Laurent2011-04-251-0/+7
| | | | | | Forced music stream volume to max when not muted and output device is HDMI. Change-Id: Ibd287cea8ae1d3f36fea6651a113bd5cf2dbad13
* Bug 4167061 remove debugging codeGlenn Kasten2011-04-131-1/+1
| | | | Change-Id: I1cb46a7bbf885c72e75d32f3f7675d90ab611e85
* Enable HDCP debugging in Stagefright (1 of 2)Glenn Kasten2011-04-111-1/+1
| | | | Change-Id: Ia3ea555d5fa45547ed6bfce59f299087ced7809c
* Stagefright: authenticate ANativeWindow.Jamie Gennis2011-04-081-0/+24
| | | | | | | | | | | 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
* Bug 4167061Glenn Kasten2011-03-301-1/+1
| | | | Change-Id: I9bf7c0f9387ad23501261b8c2d10fa6fdaba8aef
* Merge "When http streaming and Content-Length is unknown, make sure to ↵Andreas Huber2011-03-301-1/+8
|\ | | | | | | return all" into honeycomb-mr1
| * When http streaming and Content-Length is unknown, make sure to return allAndreas Huber2011-03-301-1/+8
| | | | | | | | | | | | | | data that we successfully received before signalling the error. Change-Id: I7e60602d41b4df85aa85e413c590687305e9bbce related-to-bug: 4190765
* | Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.Andreas Huber2011-03-292-4/+4
|/ | | | | Change-Id: Ib493572c614dbb74fa23b13c3e43899e3b31cf0e related-to-bug: 4147205
* Merge "After a seek there's a brief period where audio time isn't ↵Andreas Huber2011-03-281-0/+5
|\ | | | | | | reestablished." into honeycomb-mr1
| * After a seek there's a brief period where audio time isn't reestablished.Andreas Huber2011-03-251-0/+5
| | | | | | | | | | | | | | | | 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
* | Make sure we post a video event when seeking after seeing video EOS before.Andreas Huber2011-03-251-2/+17
|/ | | | | Change-Id: I513bf94c0732a85324160977ea5723d8aafd6aba related-to-bug: 3316960
* Merge "Switch to use SF cached source" into honeycomb-mr1James Dong2011-03-251-6/+1
|\
| * Switch to use SF cached sourceJames Dong2011-03-251-6/+1
| | | | | | | | | | | | bug - 3500025 Change-Id: I96c416d39af498f091d2d52f5923f556382a9c1f
* | Fix for bug 4126624.Gloria Wang2011-03-242-2/+1
|/ | | | | | Change the mDrmManagerClientImpl to sp to avoid double delete the pointer. Change-Id: I7aacea1bc58ab6425ef6f6f09472c6f2970ebb4d
* Fix for bug 4165823.Gloria Wang2011-03-242-10/+34
| | | | | | | Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge. Change-Id: I7782cc96ce173a87ebfd315950f3880fa90294d6
* Bug 4159373 Use HDCP debug settingsGlenn Kasten2011-03-231-0/+37
| | | | Change-Id: Iefc0a0d4b574ee94fbc83bf74b57c1d3465c821c
* Merge "Add one more field in DecryptHandle to support bug 4126624" into ↵Gloria Wang2011-03-222-2/+23
|\ | | | | | | honeycomb-mr1
| * Add one more field in DecryptHandle to support bug 4126624Gloria Wang2011-03-212-2/+23
| | | | | | | | Change-Id: Ic7ea5fd211c4f8283de8fdf722f89b6a94e5750b
* | Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a ↵Andreas Huber2011-03-222-3/+27
|\ \ | |/ |/| | | parsing issue." into honeycomb-mr1
| * DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.Andreas Huber2011-03-212-3/+27
| | | | | | | | | | Change-Id: Ic683201dcfcd11fb4bccfeefc63427a4c9bfabb4 related-to-bug: 4148291
* | do not merge: Cherry pick change I6529695c from master to partially fix bug ↵Gloria Wang2011-03-212-188/+104
|/ | | | | | 4126624. Change-Id: If724de60bd6da1becdffc815d5358ffe78629469
* If nothing is to be copied, return right away.Andreas Huber2011-03-211-0/+4
| | | | | | | This avoids a potential out-of-bounds problem in the code below. Change-Id: I942d55da0a5288b37512cb74407f900a2d824c0c related-to-bug: 4139974
* DO NOT MERGE Send WebView the current transform and whether we're drawing a ↵Romain Guy2011-03-181-0/+50
| | | | | | | | | | | layer. Bug #3275491 These can be used by WebView to correctly apply alpha and geometric transforms. Change-Id: I61057997f5fda1e803d247fc77500a038d5f3aab
* Fix missing AOSP copyright headers for more filesJames Dong2011-03-174-0/+64
| | | | | | | | | | o Update the copyright date on InputDispatcher_test.cpp and InputReader_test.cpp because these two files were moved from other places to the current location, and were actually created in 2010. bug - 4119349 Change-Id: Ic93b81ddafb58e9e72a2e9e02ca3d9f173d6dca7
* Fix missing AOSP copyright headers for a bunch of media framework filesJames Dong2011-03-1710-0/+159
| | | | | | bug - 4119349 Change-Id: If5924e16a5f596d5d73d9beb66eaf5ac9a6f0e50
* Add the default camera id to mCameraIds for emulator and those devices ↵James Dong2011-03-161-0/+5
| | | | | | | | without media_profiles.xml configuration file. bug - 4109530 Change-Id: Ib83be7a7f767a4b20ac338734ada1581e7a4c5bf
* DO NOT MERGE: Fix a race condition when playing an audio-only stream and ↵Andreas Huber2011-03-161-12/+5
| | | | | | | seeking before starting. Change-Id: I70dfdfb7c27e3c713079c359ef89a570eb600dc7 related-to-bug: 4039068
* Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1Eric Laurent2011-03-151-3/+11
|\
| * Improvement for issue 3489986: BT SCO volumeEric Laurent2011-03-151-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | This change makes sure that the VOICE_CALL stream volume tracks the BLUETOOTH_SCO stream volume when SCO audio is enabled. The down link audio volume now reflects what is being displayed when pressing volume hard keys on the device while in a video chat with a BT SCO headset. Volume settings on the headset and the device are still independent as we do not support handsfree profile yet. Change-Id: Ie0d2714730ea359b9318b9cbe6f0b2557ef0f976
* | Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1Glenn Kasten2011-03-155-162/+6
|\ \
| * | Bug 4016329 do full string comparisonsGlenn Kasten2011-03-145-162/+6
| |/ | | | | | | | | | | | | | | | | | | Use full string comparisons instead of partial for file extension and MIME type. Do case-insensitive comparison of MIME type and file extensions. Fix error in comment for String8::getPathExtension. Remove dead code -- StringTokenizer is unused. Change-Id: I322be6235abbdaab5f7eafa48926dbb2cf46dc29
* | For issue 4082089Gloria Wang2011-03-141-0/+7
|/ | | | | | Add more info and error events into the DRM framework Change-Id: I0bb3251c5947fc8e977d478e1ba46b242cb97e9d
* Merge "MtpDevice: Handle zero length packets in readResponse()" into ↵Mike Lockwood2011-03-141-0/+4
|\ | | | | | | honeycomb-mr1
| * MtpDevice: Handle zero length packets in readResponse()Mike Lockwood2011-03-141-0/+4
| | | | | | | | | | | | | | Bug: 3509060 Change-Id: I291eefeaa667688c9e6e75da74ec3025b84065e9 Signed-off-by: Mike Lockwood <lockwood@android.com>
generated by cgit v1.1 at 2024-09-12 07:28:38 +0000