Commit graph

416 commits

Author SHA1 Message Date
Tomasz Wasilczyk
19f00f8964 Merge "Don't depend on String8 cast to C string [drm]" into main am: 15272cf28e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2748300

Change-Id: I560a707f4167057cc45f824fca9e96286c48a6c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 19:23:41 +00:00
Tomasz Wasilczyk
15272cf28e Merge "Don't depend on String8 cast to C string [drm]" into main 2023-10-05 18:53:20 +00:00
chayemme
333a803a23 Work around fix for "libvtswidevine32.so" not found (HIDL versions) am: 79819a085d am: 51c17e5a3f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2766827

Change-Id: I82687d8830023639502adf9a75a2d1953b684d95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 22:50:43 +00:00
chayemme
51c17e5a3f Work around fix for "libvtswidevine32.so" not found (HIDL versions) am: 79819a085d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2766827

Change-Id: I20a36cc161aee037481b83d8912808991eb57822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-04 22:17:06 +00:00
chayemme
79819a085d Work around fix for "libvtswidevine32.so" not found (HIDL versions)
Bug: 299174272
Change-Id: Id7771e9ebbad46c95ae4fdbdfa1f9f9cc588b147
2023-09-28 20:29:50 +05:30
Kyle Zhang
2d64355f9d Work around fix for "libvtswidevine32.so" not found am: 720b897783 am: fac8f01d4e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2762345

Change-Id: I59e08fed391d1b6786c8b427d3521253b0e40aab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 23:23:29 +00:00
Kyle Zhang
fac8f01d4e Work around fix for "libvtswidevine32.so" not found am: 720b897783
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2762345

Change-Id: Ib27ff1c5ac57426f9368ef9bf3bf401641925e09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 22:18:17 +00:00
Kyle Zhang
720b897783 Work around fix for "libvtswidevine32.so" not found
Bug: 299290047
Change-Id: I01ef50feaaa8ff237d4d04848f9c9e67a81adc80
2023-09-26 17:13:51 +00:00
Tomasz Wasilczyk
e9ea17b597 Don't depend on String8 cast to C string [drm]
Bug: 295394788
Test: m checkbuild
Change-Id: Ie9b5530e5a1c726bd723ebd7e11a745893269acf
2023-09-13 04:25:14 +00:00
Treehugger Robot
64167c236b Merge "Merge OWNERS files for drm" into main am: de95de1939
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2746252

Change-Id: I4227b66ebdf03f533e873ceca8041f5997d30d3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 15:12:18 +00:00
Devin Moore
9ef689ccc6 Merge OWNERS files for drm
Test: none
Bug: 296950573
Change-Id: I348a5389fd759cc70e6bc643dedb68f924b1a113
2023-09-08 21:17:44 +00:00
Xin Li
ba758129d3 Merge changes from topic "udc-merge-291102124" into aosp-main-future
* changes:
  Clean up android.hardware.automotive.vehicle intermediates.
  Merge Android U (ab/10368041)
2023-08-28 22:13:07 +00:00
Treehugger Robot
24c2867516 Merge "Don't use String8 path functions" into main 2023-08-25 22:44:37 +00:00
Xin Li
879960bdce Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: I7b6fffac2ada0e039f79bad8cc9b4d954e9c3460
Change-Id: I9466127d8d0fa38df36ca99f704853b2db871e67
2023-08-25 13:29:30 -07:00
Tomasz Wasilczyk
80116affcd Use String8/16 c_str [drm]
Bug: 295394788
Test: make checkbuild
Change-Id: I8446de3a553a3ddce2da5c4551127039638e0a98
2023-08-23 18:50:11 +00:00
Tomasz Wasilczyk
7c52bb1e7f Don't use String8 path functions
Ideally, we should migrate to std::filesystem, but libc++fs is not
available for vendor binaries until b/175635923 lands.

Bug: 295394788
Test: m checkbuild
Change-Id: If285034d7b343531082d0176ab26bf51390714d0
2023-08-23 15:10:11 +00:00
Treehugger Robot
7179454ba0 Merge "Update drm/1.3/vts/OWNERS" am: e0a2388561 am: 7390d79203 am: 47ceff4828
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2551061

Change-Id: I166fbc2f2c977c3795b225a62d2caf09c735c7a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 10:54:05 +00:00
Robert Shih
431a6dd75e Update drm/1.3/vts/OWNERS
Bug: 278494162
Change-Id: I3a84dc77f1dff9c1658cdd7c362fbc8a62402a2e
2023-04-26 20:41:40 +00:00
TreeHugger Robot
903c07fe8f Merge "Update OWNERS file" into udc-dev 2023-03-30 23:53:17 +00:00
Jooyung Han
f9a0be58d9 Set min_sdk_version for the Widevine APEX
Bug: 251299786
Test: build WV APEX with V and install it on U device
Change-Id: I51e387769631bb6dd821911fdae78f36b04b86c2
2023-03-28 06:57:46 +00:00
Fred Gylys-Colwell
bddb15a53e Update OWNERS file
Bug: 274772704
Test: no code change
Change-Id: I75aa5586e5a64838e81970021d1725012b612dca
2023-03-22 09:45:00 -07:00
Robert Shih
6f60eece49 DrmHalTest: null check for skipped test am: 9049fc93a8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2417394

Change-Id: Ibcc9f17acb7b2d43b24496c07a5ad2992b659977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 23:26:58 +00:00
Robert Shih
9049fc93a8 DrmHalTest: null check for skipped test
Bug: 253168737
Change-Id: I0dea0d2482d607eecff433ffb901eba02a39770f
Test: VtsAidlHalDrmTargetTest
2023-02-01 16:39:18 +00:00
Shubhangi Pawar
05f5fd842d Merge "drm aidl vts: proper skip tests without vendor module" into android13-tests-dev 2023-01-26 03:45:22 +00:00
Robert Shih
36c6225ca7 DRM HAL README.md
Bug: 266091099
Change-Id: Ibfa71908cacd9c74891300c7c6227f2b11149503
2023-01-23 15:25:13 +00:00
Robert Shih
da4d0bcb15 Merge "drm aidl vts: proper skip tests without vendor module" 2023-01-14 04:46:22 +00:00
Kyle Zhang
997b7971df Merge "Fix OfflineLicenseTest not provisioned" into android13-tests-dev am: 6da64e6ba2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2379310

Change-Id: Ie6f9016274314948d14f30063ea4505d97d62b16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 01:45:05 +00:00
Robert Shih
d1b6beb164 drm aidl vts: proper skip tests without vendor module
Bug: 253168737
Test: VtsAidlHalDrmTargetTest
Change-Id: Iaac3ef19197dceea16061e9926c831818b27bd14
2023-01-07 12:38:43 +00:00
Robert Shih
b76b6287d9 drm aidl vts: proper skip tests without vendor module
Bug: 253168737
Test: VtsAidlHalDrmTargetTest
Change-Id: Iaac3ef19197dceea16061e9926c831818b27bd14
2023-01-06 22:27:42 -08:00
Kyle Zhang
e006233589 Fix OfflineLicenseTest not provisioned
Bug: 261096489
Test: VtsAidlHalDrmTargetTest
Change-Id: Iac3d96cefd5639f076a6c58517b1bb8f60562ddf
2023-01-07 01:35:49 +00:00
Jooyung Han
c0b24f4f13 Remove AIDL-libs from VNDK
Some are still in VNDK because they are used in other VNDK libs.

Ignore-AOSP-First: some libs are still in internal master only.

Bug: 234181591
Test: m
Merged-In: If999df9c78a20df931177da11742b1c5de19bc08
Change-Id: If999df9c78a20df931177da11742b1c5de19bc08
(cherry picked from commit 5527adfd7f)
2022-06-14 14:08:59 +09:00
Kyle Zhang
f782f6431c Add multiple provision attempts in vts openSession test
Bug: 233085112
Test: VtsAidlHalDrmTargetTest
Change-Id: I4dd42b3c7155b6476f51a8cc4cca185bea7d565f
2022-05-26 20:22:46 +00:00
Jiyong Park
70f5837e1f Freeze AIDL APIs for TM
Bug: 225941299
Test: m
Change-Id: I61eb51c0334eb99489c6f1570110d7e18c350c99
2022-04-16 07:03:24 +09:00
Chih-hung Hsieh
34593d4e2a Merge "Add timed out test files to tidy_timeout_srcs" am: ff54f73b4f am: fa83970b3a am: 581616e658
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1992232

Change-Id: I2eac13fe3b5ab0b4f15d6ceadf376e5e74124a81
2022-02-24 01:32:09 +00:00
Chih-hung Hsieh
ff54f73b4f Merge "Add timed out test files to tidy_timeout_srcs" 2022-02-24 00:21:18 +00:00
Robert Shih
1203027999 aidl drm: independent min/max SecurityLevel for each supported mime
Bug: 219528925
Test: atest MediaDrmTest.testIsCryptoSchemeSupportedForSecurityLevels
Change-Id: I9dcd786fe921c6ed4ac49bba5a6dddf887404df3
Merged-In: I9dcd786fe921c6ed4ac49bba5a6dddf887404df3
2022-02-20 19:35:30 +00:00
Robert Shih
5cb7fe91c6 Merge "Add drm aidl owners" am: 29988fd22f am: 065a377950 am: 1f1240ee1d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1991237

Change-Id: I6099376a0e13f1bcff7b4146c565a4bb96d76d91
2022-02-19 21:29:07 +00:00
Chih-Hung Hsieh
ad1bf31b78 Add timed out test files to tidy_timeout_srcs
* Timed out runs do not show any warning messages.
* These test files cannot finish clang-tidy runs with
  the following settings:
    TIDY_TIMEOUT=90
    WITH_TIDY=1
    CLANG_ANALYZER_CHECKS=1
* When TIDY_TIMEOUT is set, in Android continuous builds,
  tidy_timeout_srcs files will not be compiled by clang-tidy.
  When developers build locally without TIDY_TIMEOUT,
  tidy_timeout_srcs files will be compiled.
* Some of these test modules may be split into smaller ones,
  or disable some time consuming checks, and then
  enable clang-tidy to run within limited time.

Bug: 201099167
Test: make droid tidy-hardware-interfaces_subset
Change-Id: I1de28f1572fff368f67eab512fffec9f2e5c2a9b
2022-02-18 17:25:41 -08:00
Robert Shih
9f86aafaa2 Add drm aidl owners
Bug: 219528925
Change-Id: I6b630c4e40083f98a00f9337ffee52fb22cae06c
2022-02-17 17:47:06 -08:00
Robert Shih
020f6460b1 Merge "drm aidl vts: address ANAPIC review" 2022-02-11 06:41:46 +00:00
Robert Shih
2389ce2f9f drm aidl vts: address ANAPIC review
Interface update in change 16810770

Bug: 214410088
Test: atest VtsAidlHalDrmTargetTest
Change-Id: Ibab87c0ab1d4019a470bbb4f0a2e2932e597e681
2022-02-09 22:58:44 -08:00
Robert Shih
fe6d6b122c drm hal aidl API cleanup
* Merge IDrmFactory / ICryptoFactory
* Simplify isContentTypeSupported / isCryptoSchemeSupported
* Remove requiresSecureDecoderDefault
* DecryptArgs
* DestinationBuffer union
* byte[16] Uuid
* KeyStatusType underscores
* setSharedBufferBase generic buffer type

Bug: 214410088
Test: VtsAidlHalDrmTargetTest
Change-Id: Ic30100af9bdb95aff9d140e093edb083c1b49592
2022-02-09 18:13:45 -08:00
Kyle Zhang
c91de48292 Merge "Make interface linkable for libmediadrm" 2022-01-28 02:55:31 +00:00
Edwin
9184178f58 Make interface linkable for libmediadrm
Add build flag to fix aidl converted libmediadrm
link error.

Test: CtsMediaDrmTestCases, GtsMediaTestCases

Bug: 200055138
Bug: 170964303
Change-Id: Ifa0cfbb269e768dadf3ff69d7c0c2f17ad1eb540
2022-01-28 01:36:50 +00:00
Robert Shih
5904a72fc3 Add vts tests to verify DRM AIDL interface
The DRM AIDL interface is in change 15329852.
The default implementation of the interface is in the clearkey
HAL in change 15958954.

[TODO] APIs pending vts coverage:
+ ICryptoFactory
   + isCryptoSchemeSupported
+ ICryptoPlugin
   + getLogMessages
   + notifyResolution
   + requiresSecureDecoderComponent
+ IDrmFactory
   + getSupportedCryptoSchemes
   + isContentTypeSupported
+ IDrmPlugin
   + decrypt
   + encrypt
   + getLogMessages
   + getMetrics
   + getNumberOfSessions
   + getPropertyByteArray
   + getPropertyString
   + getSecureStop
   + getSecureStopIds
   + getSecureStops
   + queryKeyStatus
   + releaseAllSecureStops
   + releaseSecureStop
   + releaseSecureStops
   + removeAllSecureStops
   + removeKeys
   + removeSecureStop
   + requiresSecureDecoder
   + requiresSecureDecoderDefault
   + restoreKeys
   + setCipherAlgorithm
   + setMacAlgorithm
   + setPlaybackId
   + setPropertyByteArray
   + sign
   + signRSA
   + verify

Bug: 170964303
Bug: 200055138
Test: atest VtsAidlHalDrmTargetTest
Change-Id: If8b582796fdbc34d3d7720fa45df8291f72cd46a
2022-01-25 00:58:50 -08:00
Robert Shih
8ee98880ef Add Stable AIDL interface for DRM service
Test: m -j128 android.hardware.drm-update-api

Bug: 200055138
Bug: 170964303
Change-Id: I091d839cd94075bf36670a9494aa99f7b6c97365
2022-01-06 15:40:25 -08:00
Treehugger Robot
85b911c178 Merge "Add OWNERS for VTS module VtsHalDrmV1_2TargetTest" am: 760e09a453
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1793844

Change-Id: Ifa61501d76b037f3da61dd6934a63eea7ba99716
2021-09-09 22:02:15 +00:00
Treehugger Robot
7cdd3e3e02 Merge "Add OWNERS for VTS module VtsHalDrmV1_0TargetTest" am: 5b6f712628
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1793843

Change-Id: Ifb22d958e73cc18f0afa4b7acee50af0aa5c8d7b
2021-09-09 22:02:08 +00:00
Treehugger Robot
c06aea727c Merge "Add OWNERS for VTS module VtsHalDrmV1_1Target" am: 2b2bdbff6c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1793845

Change-Id: Ibd99157114bad8659b52e1d51a9aa047fb66be9d
2021-09-09 22:02:02 +00:00
Treehugger Robot
760e09a453 Merge "Add OWNERS for VTS module VtsHalDrmV1_2TargetTest" 2021-09-09 21:44:05 +00:00