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

Commit fe6d6b12 authored by Robert Shih's avatar Robert Shih
Browse files

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
parent 55a87cc1

compatibility_matrices/compatibility_matrix.current.xml

+0 −4
Original line number Diff line number Diff line
@@ -221,10 +221,6 @@ 
    <hal format="aidl" optional="true">

        <name>android.hardware.drm</name>

        <version>1</version>

        <interface>

            <name>ICryptoFactory</name>

            <regex-instance>.*</regex-instance>

        </interface>

        <interface>

            <name>IDrmFactory</name>

            <regex-instance>.*</regex-instance>

drm/aidl/aidl_api/android.hardware.drm/current/android/hardware/drm/BufferType.aidl

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.drm;

@Backing(type="int") @VintfStability

enum BufferType {

  SHARED_MEMORY = 0,

  NATIVE_HANDLE = 1,

}

drm/aidl/aidl_api/android.hardware.drm/current/android/hardware/drm/DecryptResult.aidl→drm/aidl/aidl_api/android.hardware.drm/current/android/hardware/drm/CryptoSchemes.aidl

+6 −4
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -33,7 +33,9 @@ 


package android.hardware.drm;

@VintfStability

parcelable DecryptResult {

  int bytesWritten;

  String detailedError;

parcelable CryptoSchemes {

  List<android.hardware.drm.Uuid> uuids;

  android.hardware.drm.SecurityLevel minLevel;

  android.hardware.drm.SecurityLevel maxLevel;

  List<String> mimeTypes;

}

drm/aidl/aidl_api/android.hardware.drm/current/android/hardware/drm/ICryptoFactory.aidl→drm/aidl/aidl_api/android.hardware.drm/current/android/hardware/drm/DecryptArgs.aidl

+11 −4
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -33,7 +33,14 @@ 


package android.hardware.drm;

@VintfStability

interface ICryptoFactory {

  @nullable android.hardware.drm.ICryptoPlugin createPlugin(in android.hardware.drm.Uuid uuid, in byte[] initData);

  boolean isCryptoSchemeSupported(in android.hardware.drm.Uuid uuid);

parcelable DecryptArgs {

  boolean secure;

  byte[] keyId;

  byte[] iv;

  android.hardware.drm.Mode mode;

  android.hardware.drm.Pattern pattern;

  android.hardware.drm.SubSample[] subSamples;

  android.hardware.drm.SharedBuffer source;

  long offset;

  android.hardware.drm.DestinationBuffer destination;

}

drm/aidl/aidl_api/android.hardware.drm/current/android/hardware/drm/DestinationBuffer.aidl

+1 −2
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ 


package android.hardware.drm;

@VintfStability

parcelable DestinationBuffer {

  android.hardware.drm.BufferType type;

union DestinationBuffer {

  android.hardware.drm.SharedBuffer nonsecureMemory;

  android.hardware.common.NativeHandle secureMemory;

}