| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Change-Id: Ifef0dd59ab317b1799fc899bb2e898bb09d2e5f6
|
|
|
|
|
|
|
|
|
|
|
|
| |
Contains the necessary changes to make frameworks/av build and work
on a 64-bit machine.
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
|
|
|
|
|
|
|
| |
LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it
with LOCAL_MODULE_RELATIVE_PATH.
Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
|
|
|
|
|
|
|
|
|
| |
Moving the build of the mock MediaDrm plugin back to
frameworks/av since it can't be installed by cts.
b/10668350
Change-Id: Id662bdb0775389b458f86a299392217f2d959422
|
|
|
|
|
|
|
|
|
| |
This reverts commit 5ff7836da0220b3097f36c8a5e82111816ebca62.
Fixes Fatal signal 6 (SIGABRT)" when playing or downloading a video
bug: 10542864
Change-Id: I7f81a41c3acdbeb571a514b3f65e7ba37d403cca
|
|
|
|
|
|
|
|
|
| |
1. Don't expect plugins to support an empty mimeType in isContentTypeSupported
2. Move the cts test mock drm plugin to the cts tree so it is always used
b/10528466
Change-Id: I6023f6165b1e9d294986f7e5cd0896e056e376f1
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In DRM framework, plugins can transmit DrmInfoEvent to Java layer.
Although DrmInfoEvent has several entries, current implementation
can only convey integer and String. This change enables plugins
uto propagate a hashmap to Java layer. The hashmap can have
one or more Strings and one byte array as value.
Changes are made by Sony Corporation.
bug: 10459159
Change-Id: Ic19265d4ad3db4eda66a3c27e1e08873a8f2a4d7
(cherry picked from commit 4f782bf0cb69929ebf03de239e2c9bf8e82adf5e)
|
|
|
|
|
| |
bug: 10244066
Change-Id: I317f05b146db962c271893f6208890a5a6c396f1
|
|
|
|
|
| |
bug: 9545965
Change-Id: Ia6e09efa826b1349d027045e782980daeb7d7596
|
|
|
|
|
|
| |
bug: 8604418
Change-Id: I173fa1ec904ba11dc4cff0343462b3f4bac0d365
|
|
|
|
|
| |
Bug: 8580410
Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
|
|
|
|
| |
Change-Id: I007f147d693664e777b8758be2bb8a4c7ec0236b
|
|
|
|
|
|
|
|
| |
Clarify offline usage of sessions and keys and implement
implement CryptoSession to support additional crypto use
cases.
Change-Id: I5d8000ce7e1dd7eba08969fc50296c9e1456c4fc
|
|
|
|
| |
Change-Id: I9ff8eeb7d0c383b5c0c68cd54eb54ce7d2d22fe6
|
|
|
|
| |
Change-Id: Ia1e81a91b4b8dc1bf3558a4aa06e90a955c6fbe6
|
|
|
|
|
|
|
|
| |
wrong size in forward lock
Modified by James Dong <jdong@google.com>
Change-Id: Iaacfc79b2b26bdee7046d8555e3b4e0bc224c3c5
|
|
|
|
| |
Change-Id: Ib1276bec6cafb4e94f8f13b52e50e4987765eec4
|
|
|
|
|
|
|
|
|
|
|
| |
In the original code a random number is used to get try
to find an empty slot in the list of free DRM id's.
When you reached the limit of 0xfff id's you ended up
in an eternal loop causing ANRs.
Updated by James Dong <jdong@google.com>.
Change-Id: I70176cc3f770223c4a8060f9739fe2bc03a703d9
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Part of CL https://googleplex-android-review.googlesource.com/#/c/222797/
This modifies the marshall/unmarshall of IDrmManagerService::
acquireDrmInfo() to watch for DrmInfoRequest tag "FileDescriptorKey".
If tag is present convert string to binary FD, then back to string
after passage through the interface's Binder.
Relevant bug reports:
bug: 6426185
Change-Id: I63748b7c986ca0a89613ed3f1c81f24cffb7a9b2
|
|
|
|
|
|
|
|
|
| |
This patch enables the drm framework to avoid opening files directly.
As a result, the drm framework no longer needs the sdcard read permision.
o related-to-bug: 6426185
Change-Id: Ib176c35ef4b1a1a405e8e954f19a7985266f2510
|
|
|
|
| |
Change-Id: I94d01f6ad5b1676cc4d6a95807e166f3c25aa79c
|
|\
| |
| |
| |
| |
| |
| | |
/frameworks/av/" into jb-dev
* commit 'e20435de10f63af812da9d4f801b61a8817733a0':
Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/
|
| |
| |
| |
| |
| | |
Change-Id: I0a3af3e2abdedebd5934f3d941d01c32cfc75e26
related-to-bug: 6647465
|
|/
|
|
|
|
|
|
|
|
|
|
| |
In case of DRM streaming, decrypt session can start just after
receiving the header, and it doesn't need to wait for the entire
content. However, current API of DRM framework only accepts file
handle or URI. With this new API, DRM session can start
without waiting for the entire content.
Changes are made by SEMC and Sony.
Change-Id: I74375fe127df636067f1c300ea91654ba3d1aa3c
|
|
|
|
|
|
|
| |
Allow anyone to talk to drm services.
Change-Id: I5c2f3c419d01de30c3d6e2bc85b1fe5c9c37b392
related-to-bug: 6276111
|
|
|
|
|
|
| |
static library.
Change-Id: Ia2c4b4fb3b78cbe0d2856cec073b2c7f9c28d3cb
|
|
|
|
| |
Change-Id: I7b7a1acce4d6db748ff193270e73bc3582ba2380
|
|
|
|
|
|
|
| |
o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc
o remove some runtime dependencies to libandroid, libandroid_runtime, etc
Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
|
|\
| |
| |
| | |
against the supported ones"
|
| |
| |
| |
| |
| |
| | |
supported ones
Change-Id: I6a20832f6a2dfb8554dbddef0dee87cc21c05c80
|
|\ \ |
|
| |/
| |
| |
| | |
Change-Id: I8df2a90409c9266a094a1a0904a5ff76ec483d16
|
|/
|
|
| |
Change-Id: I2cecdba49cf044d2aafd8aa404d27df311cad401
|
|\ |
|
| |
| |
| |
| | |
Change-Id: I47d24070c7bda385cd1d7fa1f6a75dbb1f82b476
|
|/
|
|
| |
Change-Id: I0e7f60b61f03fde046fc1ad668b28cdee635898b
|
|
|
|
|
|
| |
o all drm calls using a DecryptHandle now check the permission before proceeding
Change-Id: Ic992a991357876c6e4bfbfab4f5eec1fa0634a13
|
|
|
|
| |
Change-Id: I14033861e74d20f9d4897b651c4eeee126d4d610
|
|
|
|
|
|
|
|
|
|
|
|
| |
This avoid lengthy/duplicate sniffing for drm plugins when a decrypt session is opened
o The change is backward compatibile in that no update is required
for existing drm plug-ins if they do not plan to provide separate
sniffer/extractor
related-to-bug: 5725548
Change-Id: I7fc4caf82d77472da4e2bc7b5d31060fb54fd84c
|
|
|
|
|
|
|
| |
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
|
|
|
|
|
|
|
| |
See https://android-git.corp.google.com/g/157065
Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
|
|
|
|
|
|
|
| |
See https://android-git.corp.google.com/g/156016
Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
|
|\
| |
| |
| |
| |
| |
| | |
to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
* commit '3f6a7d1ee961a4544563932b7499535dc1cac1ec':
Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
because SHA/MD5 module is stuck
1. Revert "Fix drm flag setting missed in false drm recognition fix."
This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
2. Revert "Fixed the false drm recognition."
This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230.
3. Revert "Fix drm enumeration order, resolves failure to play forward lock ringtones"
This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369.
4. Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long."
This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9.
As a result of the reverting, many ANRs from WV sniffing are back.
related-to-bug: 5739618
|
|\ \
| |/
| |
| |
| | |
* commit 'f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1':
Fix drm enumeration order, resolves failure to play forward lock ringtones
|
| |
| |
| |
| |
| | |
Change-Id: I58e8a26849409bc3bf98b066c5e07c2a0c91e0c9
related-to-bug: 5735466
|
| |
| |
| |
| |
| |
| | |
Log did not have a tag, and was wrong level
Change-Id: I8d12895c80483e1e39f117a393b8be2f4bdd3e1d
|
|/
|
|
|
|
|
| |
See https://android-git.corp.google.com/g/#/c/143865
Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
|
|
|
|
|
|
|
|
| |
are already loaded.
BUG: 5284436
Change-Id: I99267c81a488860c3c7edb747100d44f3083bfc2
|
|\
| |
| |
| | |
Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
|