Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd522e6e authored by Edwin Wong's avatar Edwin Wong
Browse files

Update clearkey plugin to drm HAL v1.4 

Add support for getLogMessages, requiresSecureDecoder,
requiresSecureDecoderDefault and setLogSessionId.

getLogMessages is stubbed out for now.

Test: atest
  atest CtsMediaTestCases:android.media.cts.MediaDrmClearkeyTest#testGetLogSessionId

Bug: 182525516
Change-Id: I41a94da8c9111d7108b5dd963fc6040fcd031137
parent b9e4a51b

drm/mediadrm/plugins/clearkey/hidl/AesCtrDecryptor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
namespace android {

namespace hardware {

namespace drm {

namespace V1_2 {

namespace V1_4 {

namespace clearkey {



using ::android::hardware::drm::V1_0::SubSample;
@@ -79,7 +79,7 @@ Status AesCtrDecryptor::decrypt( 
}



} // namespace clearkey

} // namespace V1_2

} // namespace V1_4

} // namespace drm

} // namespace hardware

} // namespace android

drm/mediadrm/plugins/clearkey/hidl/Android.bp

+8 −7
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ cc_defaults { 
        "android.hardware.drm@1.1",

        "android.hardware.drm@1.2",

        "android.hardware.drm@1.3",

        "android.hardware.drm@1.4",

        "libbase",

        "libbinder",

        "libcrypto",
@@ -110,18 +111,18 @@ cc_binary { 
}



cc_binary {

    name: "android.hardware.drm@1.3-service.clearkey",

    name: "android.hardware.drm@1.4-service.clearkey",

    defaults: ["clearkey_service_defaults"],

    srcs: ["service.cpp"],

    init_rc: ["android.hardware.drm@1.3-service.clearkey.rc"],

    vintf_fragments: ["manifest_android.hardware.drm@1.3-service.clearkey.xml"],

    init_rc: ["android.hardware.drm@1.4-service.clearkey.rc"],

    vintf_fragments: ["manifest_android.hardware.drm@1.4-service.clearkey.xml"],

}



cc_binary {

    name: "android.hardware.drm@1.3-service-lazy.clearkey",

    overrides: ["android.hardware.drm@1.3-service.clearkey"],

    name: "android.hardware.drm@1.4-service-lazy.clearkey",

    overrides: ["android.hardware.drm@1.4-service.clearkey"],

    defaults: ["clearkey_service_defaults"],

    srcs: ["serviceLazy.cpp"],

    init_rc: ["android.hardware.drm@1.3-service-lazy.clearkey.rc"],

    vintf_fragments: ["manifest_android.hardware.drm@1.3-service.clearkey.xml"],

    init_rc: ["android.hardware.drm@1.4-service-lazy.clearkey.rc"],

    vintf_fragments: ["manifest_android.hardware.drm@1.4-service.clearkey.xml"],

}

drm/mediadrm/plugins/clearkey/hidl/Base64.cpp

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
namespace android {

namespace hardware {

namespace drm {

namespace V1_2 {

namespace V1_4 {

namespace clearkey {



sp<Buffer> decodeBase64(const std::string &s) {
@@ -169,7 +169,7 @@ void encodeBase64Url(const void *_data, size_t size, std::string *out) { 
}



} // namespace clearkey

} // namespace V1_2

} // namespace V1_4

} // namespace drm

} // namespace hardware

} // namespace android

drm/mediadrm/plugins/clearkey/hidl/Buffer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
namespace android {

namespace hardware {

namespace drm {

namespace V1_2 {

namespace V1_4 {

namespace clearkey {



Buffer::Buffer(size_t capacity)
@@ -47,7 +47,7 @@ Buffer::~Buffer() { 
}



} // namespace clearkey

} // namespace V1_2

} // namespace V1_4

} // namespace drm

} // namespace hardware

} // namespace android

drm/mediadrm/plugins/clearkey/hidl/CreatePluginFactories.cpp

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
namespace android {

namespace hardware {

namespace drm {

namespace V1_3 {

namespace V1_4 {

namespace clearkey {



extern "C" {
@@ -38,7 +38,7 @@ ICryptoFactory* createCryptoFactory() { 
} // extern "C"



}  // namespace clearkey

}  // namespace V1_3

}  // namespace V1_4

}  // namespace drm

}  // namespace hardware

}  // namespace android