Edwin Wong
58a1b32895
Check scopeId size in provideKeyResponse
...
Need to check scopeId size before access.
Bug: 144507096
Test: sts
ANDROID_BUILD_TOP= ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_11#testPocBug_144507096
Merged-In: I5d875f98e29c1115c156f7364c9c042426e17d7c
Change-Id: I5d875f98e29c1115c156f7364c9c042426e17d7c
(cherry picked from commit a9b9a30d3a764eddc6059cbc4d4ed60c64f55534)
(cherry picked from http://go/ag/10026240 )
4 years ago
Robert Shih
fc62baf940
Remove DRM IResourceManagerClient on session close
...
Bug: 145889838
Test: DrmSessionManagerTest
Test: Youtube/Play Movies & `adb shell dumpsys media.resource_manager`
Change-Id: I48a8001dbab25a0f4cc1afb15e071f22f1c6d7de
4 years ago
Robert Shih
86f5034e60
Merge "DrmManager: locally aggregate API metrics"
4 years ago
Robert Shih
7bcf792dd8
DrmManager: locally aggregate API metrics
...
Aggregate DrmManager API invocation counts per plugin over at least
fixed period of time before sending metrics to mediametrics service.
The default period is 1 day; the period is configurable through the
property drmmanager.metrics.period.
Bug: 134789967
Test: dumpsys media.metrics
Change-Id: I2cf28f1dfaa485ca319360705b872eed995b3d7f
4 years ago
TreeHugger Robot
8f445de3d1
Merge "Use SharedRefBase::make to allocate."
4 years ago
Steven Moreland
e0496a2a45
Use SharedRefBase::make to allocate.
...
SharedRefBase now encapsulates heap allocation in order to guard against
some types of double-ownership.
Bug: 149249948
Test: TH
Change-Id: Ida943c895225331a853e4c8da54454d60b17000a
4 years ago
TreeHugger Robot
cb3bd4065c
Merge "DrmUtils: return 1.3 hidl factories"
4 years ago
Robert Shih
2c37787ed7
DrmUtils: return 1.3 hidl factories
...
Bug: 139134043
Test: MediaDrmGenericOpsTest
Change-Id: I0447758344432eff84bd5221e575f9dca3db56d4
4 years ago
Marco Nelissen
5277625231
Merge "Remove mediametrics include symlinks"
5 years ago
Edwin Wong
9cb76c1201
Merge "Fix heap buffer overflow in clearkey CryptoPlugin::decrypt"
5 years ago
Edwin Wong
84ff6cf52a
Merge "Fix heap buffer overflow for releaseSecureStops."
5 years ago
Marco Nelissen
7c96ea7ff8
Remove mediametrics include symlinks
...
Bug: 143245419
Test: build
Change-Id: I6c836e60c0fe078f5ab7370aec156bdd6e8dcbf0
5 years ago
Edwin Wong
591f24cd32
Fix heap buffer overflow in clearkey CryptoPlugin::decrypt
...
Fix destPtr was not pointing to destination raw pointer.
merge from qt-qpr1-dev: go/ag/9941940
bug: 144506242
Test: sts
ANDROID_BUILD_TOP= ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_12#testPocBug_144506242
Change-Id: I9fb4ad350ec25dd697940fee57748652745a951d
5 years ago
Marco Nelissen
a51151aacf
Link with actual headers instead of symlinks
...
and remove the symlinks.
Bug: 143245419
Test: build
Change-Id: I70e450d9db0f65048f86391c4d3f341659cd213f
5 years ago
Edwin Wong
38d27e7b46
Fix heap buffer overflow for releaseSecureStops.
...
If the input SecureStopRelease size is less than sizeof(uint32_t)
in releaseSecureStops(), an out of bound read will occur.
bug: 144766455
bug: 144746235
bug: 147281068
Test: sts
ANDROID_BUILD_TOP= ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_11#testPocBug_144766455
Change-Id: I8c89797869addf83342a4f32e17bce0515713119
5 years ago
Robert Shih
fc3a56f69f
Merge "clearkey hidl: add 1.3 services"
5 years ago
Ray Essick
f27e987d27
Naming consistency: MediaAnalytics to MediaMetrics
...
Bug: 145780674
Test: build, boot, dumpsys media.metrics
Test: atest mediametrics_tests CtsNativeMediaMetricsTestCases
Change-Id: Icbfa98da9e61702aee9a1d807b5e126b4b9c6458
5 years ago
Robert Shih
12606bad3f
clearkey hidl: add 1.3 services
...
Bug: 139134043
Test: MediaDrmTest
Change-Id: I64bd6472c6fed1285abdeb010240c05be237ac44
5 years ago
Robert Shih
a1ac5ba163
Merge "Update clearkey plugin to drm HAL v1.3"
5 years ago
Robert Shih
e3c93d02f7
Merge "libmediadrm: final libbinder cleanup"
5 years ago
Robert Shih
be926583c0
Update clearkey plugin to drm HAL v1.3
...
This CL implements IDrmFactory::getSupportedCryptoSchemes
Bug: 139134043
Test: MediaDrmGenericOpsTest
Change-Id: I4ed420e2f9285398548a3b87e9125be2671c613b
5 years ago
Robert Shih
d3f9ba74b1
libmediadrm: final libbinder cleanup
...
Bug: 134787536
Test: build
Change-Id: I7a0da8fdb1164486980bde835eb04089aaf78655
5 years ago
Robert Shih
c0d1d0eeb4
DrmHal: use DrmUtils to create IDrmFactories
...
Bug: 134787536
Test: MediaDrmClearkeyTest
Change-Id: I7b269b6888b925f109b2a6a378fc15e675fc011a
5 years ago
Robert Shih
9353881598
libmediadrm: refactor bundle dependency
...
Bundle dependency now lives in DrmMetricsConsumer,
which is part of the new libmediadrmmetrics_consumer.
Bug: 134787536
Test: DrmMetrics_test
Change-Id: I09b0981b6f97668c2572fb28d0e98de72068376b
5 years ago
Robert Shih
88468e169a
Merge "mediadrm: new IDrmMetricsConsumer interface"
5 years ago
Robert Shih
7bda00681f
Merge "DrmHal: remove permission check"
5 years ago
Robert Shih
6152d7c7ea
DrmHal: remove permission check
...
Permission check should now be performed in HIDL HALs. The removed app-side
permission check does not accomplish much because any app can communicate
with a Drm HIDL HAL directly.
Bug: 134787536
Test: CastV2SignerTest
Change-Id: I4d90effbc0a265459829c63e843b9a5d16e75359
5 years ago
Robert Shih
5c65cc79f1
Merge "ICrypto: use hidl memory instead of binder memory"
5 years ago
Robert Shih
895fba9a49
ICrypto: use hidl memory instead of binder memory
...
Bug: 134787536
Test: GtsMediaTestCases
Change-Id: Ib20600eac13c668c8dc6a964faad1874844e4026
5 years ago
Robert Shih
22a082cd73
Merge "mediadrm: use stable C interface to record metrics"
5 years ago
Robert Shih
8aab9af295
Merge "Remove IMediaDrmService"
5 years ago
Robert Shih
369b4e0cd1
Merge "DrmSessionManager: use ndk resourcemanager"
5 years ago
Greg Kaiser
68db3a07ae
Merge "Revert "DecryptHandle cleanup"" am: 43251208e3
am: 290638a8f6
...
am: b2b8453eed
Change-Id: I9ab184f3766b2d20a0f548ad65fd519dce515682
5 years ago
Greg Kaiser
290638a8f6
Merge "Revert "DecryptHandle cleanup""
...
am: 43251208e3
Change-Id: Ief6609328e84f298aa23b9fbc8fab7fa4651b7a2
5 years ago
Greg Kaiser
81e1c00852
Revert "DecryptHandle cleanup"
...
This reverts commit e75d74c70f
.
Test: Local build completes
Bug: 144814133
5 years ago
Marco Nelissen
493a55d111
Merge "DecryptHandle cleanup" am: a8129f7246
am: f1a372c179
...
am: f2bb7b0ccc
Change-Id: I028916e64c3635d33a5ef27a26c746513e75f23b
5 years ago
Marco Nelissen
f1a372c179
Merge "DecryptHandle cleanup"
...
am: a8129f7246
Change-Id: Ic3cdf5aee592514f48beaac88b139600ffbcf8d5
5 years ago
Marco Nelissen
e75d74c70f
DecryptHandle cleanup
...
Remove copyControlVector, extendedData and decryptInfo from DecryptHandle,
since none of these were actually used.
Test: atest cts/tests/tests/drm/src/android/drm/cts/DRMTest.java
Change-Id: I499bf4884e467b53d05e1317e3dbe0bd85537577
5 years ago
Robert Shih
6d108731e7
Remove IMediaDrmService
...
Bug: 134787536
Test: WidevineGenericOpsTests
Change-Id: I441a4029287caae40bcf88e5fabd6ebe0704f5bc
5 years ago
Robert Shih
0f3a8a0d98
DrmSessionManager: use ndk resourcemanager
...
Bug: 134787536
Bug: 144588885
Test: DrmSessionManagerTest
Test: DrmSessionManager_test
Test: MediaDrmClearkeyTest.testGetNumberOfSessions
Test: WidevineGenericOpsTests.testL1
Change-Id: I2d0bf13d41b32fb5f17e097c0097c1c596c7ab2f
5 years ago
Robert Shih
75e12cc76b
mediadrm: new IDrmMetricsConsumer interface
...
An IDrmMetricsConsumer accepts metrics exported by IDrm/ICrypto
Bug: 141811737
Test: dumpsys media.metrics
Change-Id: I6827fa6b11b9ea18834de731041dcb91b3f31fab
5 years ago
Jaewoong Jung
5406f2634c
Merge "Revert "Remove (I)MediaDrmService""
5 years ago
Jaewoong Jung
88888a4636
Revert "Remove (I)MediaDrmService"
...
This reverts commit 54482b573e
.
Reason for revert: Broke git_master on build_test
Fixes: 144601027
Change-Id: Id98fe3875a7e06bcae9c640958e28217a68fbc25
5 years ago
Robert Shih
0d66383887
Merge "DrmUtils: helpers to create hidl Drm Factories/Plugins"
5 years ago
Robert Shih
54482b573e
Remove (I)MediaDrmService
...
Also alias init.svc.mediadrm to init.svc.media.
Bug: 134787536
Test: WidevineGenericOpsTests
Change-Id: I09d4c459ae2fd7fb4e7f499c08f87be3f22973fd
5 years ago
Robert Shih
a54e81fc42
IDrmClient: remove IBinder inheritence
...
Bug: 134787536
Test: GtsMediaTestCases
Change-Id: I2c9ea8c1bd35165573a169015c78d052f080606c
5 years ago
Robert Shih
5ff3ad6c57
DrmUtils: helpers to create hidl Drm Factories/Plugins
...
Bug: 134787536
Test: testPocCVE_2016_0811
Change-Id: I05814014786d5ddf72998528dad0abdf551ec5af
5 years ago
Robert Shih
9ad157448a
IDrm: remove IBinder inheritance
...
Bug: 134787536
Test: GtsMediaTestCases
Change-Id: I8e409e7048c9058f2d91ad2d467131f49e378259
5 years ago
Robert Shih
6571bf6fad
IMediaDrmService: remove makeDrm method
...
This means IDrm will always be local.
Bug: 134787536
Test: GtsMediaTestCases
Change-Id: I291cca47b97c3f5da40e750bd339693268b46ba0
5 years ago
Robert Shih
82ea6be9a7
mediadrm: use stable C interface to record metrics
...
Bug: 134787536
Test: dumpsys media.metrics
Change-Id: I0156052334d0b52691cde82b71c5dc0f40d13fb5
5 years ago