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

Commit dd538c3b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7286185 from fe7eed56 to sc-v2-release

Change-Id: I9048cb7ec1490bffc798b316cc98077409a6775f
parents e78fdca9 fe7eed56
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ interface IRadioIndication extends @1.5::IRadioIndication {
    /**
     * Indicates physical channel configurations.
     *
     * An empty configs list indicates that the radio is in idle mode.
     * An empty configs list shall be returned when the radio is in idle mode (i.e. RRC idle).
     *
     * @param type Type of radio indication
     * @param configs Vector of PhysicalChannelConfigs
+1 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ interface IRadioResponse extends @1.5::IRadioResponse {
     *   RadioError:RADIO_NOT_AVAILABLE
     *   RadioError:INTERNAL_ERR
     *   RadioError:REQUEST_NOT_SUPPORTED
     *   RadioError:INVALID_STATE
     */
    oneway setNrDualConnectivityStateResponse(RadioResponseInfo info);

+1 −0
Original line number Diff line number Diff line
@@ -392,6 +392,7 @@ TEST_P(RadioHidlTest_v1_6, setNrDualConnectivityState) {
                CheckAnyOfErrors(radioRsp_v1_6->rspInfo.error,
                                 {::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE,
                                  ::android::hardware::radio::V1_6::RadioError::INTERNAL_ERR,
                                  ::android::hardware::radio::V1_6::RadioError::INVALID_STATE,
                                  ::android::hardware::radio::V1_6::RadioError::NONE}));
    }
}
+26 −19
Original line number Diff line number Diff line
@@ -60,29 +60,36 @@ parcelable KeyCreationResult {
     * `attestationKey` parameter of `generateKey()`, `importKey()` or `importWrappedKey()`), and in
     * the non-attestaion case, whether the key can self-sign.
     *
     * 1.  Attestation with factory key.  If Tag::ATTESTATION_CHALLENGE is provided and the
     *     `attestationKey` parameter on the generate/import call is null, the returned certificate
     *     chain must contain an attestation certificate signed with a factory-provisioned
     *     attestation key, and the full certificate chain for that factory-provisioned attestation
     *     key.
     * 1.  Asymmetric key attestation with factory key.  If Tag::ATTESTATION_CHALLENGE is provided
     *     and the `attestationKey` parameter on the generate/import call is null, the returned
     *     certificate chain must contain an attestation certificate signed with a factory-
     *     provisioned attestation key, and the full certificate chain for that factory-provisioned
     *     attestation key.  Tag::ATTESTATION_APPLICATION_ID must also be provided when the
     *     ATTESTATION_CHALLENGE is provided, otherwise ATTESTATION_APPLICATION_ID_MISSING will be
     *     returned.
     *
     * 2.  Attestation with caller-provided key.  If Tag::ATTESTATION_CHALLENGE is provided and the
     *     `attestationKey` parameter on the generat/import call is non-null and contains the key
     *     blob of a key with KeyPurpose::ATTEST_KEY, the returned certificate chain must contain
     *     only an attestation certificate signed with the specified key.  The caller must know the
     *     certificate chain for the provided key.
     * 2.  Asymmetric key attestation with caller-provided key.  If Tag::ATTESTATION_CHALLENGE is
     *     provided and the `attestationKey` parameter on the generat/import call is non-null and
     *     contains the key blob of a key with KeyPurpose::ATTEST_KEY, the returned certificate
     *     chain must contain only an attestation certificate signed with the specified key.  The
     *     caller must know the certificate chain for the provided key.  Tag::
     *     ATTESTATION_APPLICATION_ID must also be provided when the ATTESTATION_CHALLENGE is
     *     provided, otherwise ATTESTATION_APPLICATION_ID_MISSING will be returned.
     *
     * 3.  Non-attestation with signing key.  If Tag::ATTESTATION_CHALLENGE is not provided and the
     *     generated/imported key has KeyPurpose::SIGN, then the returned certificate chain must
     *     contain only a single self-signed certificate with no attestation extension.
     * 3.  Asymmetric key non-attestation with signing key.  If Tag::ATTESTATION_CHALLENGE is not
     *     provided and the generated/imported key has KeyPurpose::SIGN, then the returned
     *     certificate chain must contain only a single self-signed certificate with no attestation
     *     extension.  Tag::ATTESTATION_APPLICATION_ID will be ignored if provided.
     *
     * 4.  Non-attestation with non-signing key.  If TAG::ATTESTATION_CHALLENGE is not provided and
     *     the generated/imported key does not have KeyPurpose::SIGN, then the returned certificate
     *     chain must contain only a single certificate with an empty signature and no attestation
     *     extension.
     * 4.  Asymmetric key non-attestation with non-signing key.  If TAG::ATTESTATION_CHALLENGE is
     *     not provided and the generated/imported key does not have KeyPurpose::SIGN, then the
     *     returned certificate chain must contain only a single certificate with an empty signature
     *     and no attestation extension.  Tag::ATTESTATION_APPLICATION_ID will be ignored if
     *     provided.
     *
     * 5.  Symmetric key.  If the generated/imported key is symmetric, the certificate chain must be
     *     empty.
     * 5.  Symmetric key.  If the generated/imported key is symmetric, the certificate chain must
     *     return empty, any Tag::ATTESTATION_CHALLENGE or Tag::ATTESTATION_APPLICATION_ID inputs,
     *     if provided, are ignored.
     */
    Certificate[] certificateChain;
}