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

Commit ebd1e784 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11697857 from be4a431a to 24Q3-release

Change-Id: Ie3738f9b6956398b6d3c4995604e24a72e84d6f5
parents 1dcc3f5e be4a431a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -853,9 +853,9 @@
                "description": "Window Move\nThe maxInt32Value and minInt32Value in each VehicleAreaConfig must be defined. All integers between minInt32Value and maxInt32Value must be supported.\nThe maxInt32Value indicates the window is opening in plane\/closing in the out of plane direction at the fastest speed. The minInt32Value indicates the window is closing in plane\/opening in the out of plane direction at the fastest speed.\nLarger absolute values, either positive or negative, indicate a faster movement speed. Once the window reaches the positional limit, the value must reset to 0. If WINDOW_MOVE's value is currently 0, then that means there is no movement currently occurring.\nThis property is not in any particular unit but in a specified range of relative movement speeds.\nFor a window that may open out of plane (i.e. vent mode of sunroof) this parameter will work as follows:\nIf sunroof is open: Max = open the sunroof further, automatically stop when fully open. Min = close the sunroof, automatically stop when sunroof is closed.\nIf vent is open: Max = close the vent, automatically stop when vent is closed. Min = open the vent further, automatically stop when vent is fully open.\nIf sunroof is in the closed position: Max = open the sunroof, automatically stop when sunroof is fully open. Min = open the vent, automatically stop when vent is fully open.\nThis property is defined as VehiclePropertyAccess.READ_WRITE, but OEMs have the option to implement it as VehiclePropertyAccess.READ only."
            },
            {
                "name": "Window Lock",
                "name": "Window Child Lock",
                "value": 320867268,
                "description": "Window Lock\nTrue indicates windows are locked and can't be moved.\nThis property is defined as VehiclePropertyAccess.READ_WRITE, but OEMs have the option to implement it as VehiclePropertyAccess.READ only."
                "description": "Window Child Lock\nTrue indicates the window is child-locked.\nThis property is defined as VehiclePropertyAccess.READ_WRITE, but OEMs have the option to implement it as VehiclePropertyAccess.READ only."
            },
            {
                "name": "WINDSHIELD_WIPERS_PERIOD",
+2 −2
Original line number Diff line number Diff line
@@ -3286,9 +3286,9 @@ enum VehicleProperty {
    WINDOW_MOVE = 0x0BC1 + 0x10000000 + 0x03000000
            + 0x00400000, // VehiclePropertyGroup:SYSTEM,VehicleArea:WINDOW,VehiclePropertyType:INT32
    /**
     * Window Lock
     * Window Child Lock
     *
     * True indicates windows are locked and can't be moved.
     * True indicates the window is child-locked.
     *
     * This property is defined as VehiclePropertyAccess.READ_WRITE, but OEMs have the option to
     * implement it as VehiclePropertyAccess.READ only.
+10 −2
Original line number Diff line number Diff line
@@ -33,9 +33,17 @@

package android.hardware.security.see.hwcrypto;
interface IHwCryptoKey {
  android.hardware.security.see.hwcrypto.IHwCryptoKey.DiceCurrentBoundKeyResult deriveCurrentDicePolicyBoundKey();
  android.hardware.security.see.hwcrypto.IHwCryptoKey.DiceBoundKeyResult deriveDicePolicyBoundKey(in byte[] dicePolicyForKeyVersion);
  android.hardware.security.see.hwcrypto.IHwCryptoKey.DiceCurrentBoundKeyResult deriveCurrentDicePolicyBoundKey(in android.hardware.security.see.hwcrypto.IHwCryptoKey.DiceBoundDerivationKey derivationKey);
  android.hardware.security.see.hwcrypto.IHwCryptoKey.DiceBoundKeyResult deriveDicePolicyBoundKey(in android.hardware.security.see.hwcrypto.IHwCryptoKey.DiceBoundDerivationKey derivationKey, in byte[] dicePolicyForKeyVersion);
  android.hardware.security.see.hwcrypto.IHwCryptoKey.DerivedKey deriveKey(in android.hardware.security.see.hwcrypto.IHwCryptoKey.DerivedKeyParameters parameters);
  enum DeviceKeyId {
    DEVICE_BOUND_KEY,
    BATCH_KEY,
  }
  union DiceBoundDerivationKey {
    android.hardware.security.see.hwcrypto.IOpaqueKey opaqueKey;
    android.hardware.security.see.hwcrypto.IHwCryptoKey.DeviceKeyId keyId;
  }
  parcelable DiceCurrentBoundKeyResult {
    android.hardware.security.see.hwcrypto.IOpaqueKey diceBoundKey;
    byte[] dicePolicyForKeyVersion;
+34 −2
Original line number Diff line number Diff line
@@ -22,6 +22,30 @@ import android.hardware.security.see.hwcrypto.KeyPolicy;
 * Higher level interface to access and generate keys.
 */
interface IHwCryptoKey {
    /*
     * Identifier for the requested device provided key. The currently supported identifiers are:
     *
     * DEVICE_BOUND_KEY:
     *      This is a key unique to the device.
     * BATCH_KEY:
     *      This is a shared by a set of devices.
     */
    enum DeviceKeyId {
        DEVICE_BOUND_KEY,
        BATCH_KEY,
    }
    union DiceBoundDerivationKey {
        /*
         * Opaque to be used to derive the DICE bound key.
         */
        IOpaqueKey opaqueKey;

        /*
         * Device provided key to be used to derive the DICE bound key.
         */
        DeviceKeyId keyId;
    }

    parcelable DiceCurrentBoundKeyResult {
        /*
         * Key cryptographically bound to a DICE policy.
@@ -112,17 +136,24 @@ interface IHwCryptoKey {
     *                              policy. It will return this current policy back to the caller
     *                              along with the generated key.
     *
     * @derivationKey:
     *     Key to be used to derive the new key using HKDF.
     *
     * Return:
     *      Ok(DiceCurrentBoundKeyResult) on success, service specific error based on
     *      <code>HalErrorCode</code> otherwise.
     */
    DiceCurrentBoundKeyResult deriveCurrentDicePolicyBoundKey();
    DiceCurrentBoundKeyResult deriveCurrentDicePolicyBoundKey(
            in DiceBoundDerivationKey derivationKey);

    /*
     * deriveDicePolicyBoundKey() - Derive a versioned key by checking the provided DICE policy
     *                              against the caller and then using it as a context for deriving
     *                              the returned key.
     *
     * @derivationKey:
     *     Key to be used to derive the new key using HKDF.
     *
     * @dicePolicyForKeyVersion:
     *     Policy used to derive keys tied to specific versions. Using this parameter
     *     the caller can tie a derived key to a minimum version of itself, so in the future only
@@ -137,7 +168,8 @@ interface IHwCryptoKey {
     *      Ok(DiceBoundKeyResult) on success, service specific error based on
     *      <code>HalErrorCode</code> otherwise.
     */
    DiceBoundKeyResult deriveDicePolicyBoundKey(in byte[] dicePolicyForKeyVersion);
    DiceBoundKeyResult deriveDicePolicyBoundKey(
            in DiceBoundDerivationKey derivationKey, in byte[] dicePolicyForKeyVersion);

    /*
     * deriveKey() - Derive a new key based on the given key, policy and context.