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

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

Snap for 7328689 from 8716375c to sc-v2-release 

Change-Id: I2cd8e2807ef5e878a0cca29bffd3bba53e68b46a
parents 2c15870f 8716375c

nfc/1.0/default/Nfc.cpp

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ Nfc::Nfc(nfc_nci_device_t* device) : mDevice(device) {} 
::android::hardware::Return<NfcStatus> Nfc::coreInitialized(const hidl_vec<uint8_t>& data)  {

    hidl_vec<uint8_t> copy = data;



    if (mDevice == nullptr) {

    if (mDevice == nullptr || copy.size() == 0) {

        return NfcStatus::FAILED;

    }

    int ret = mDevice->core_initialized(mDevice, &copy[0]);

security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/IKeyMintDevice.aidl

+1 −0
Original line number Diff line number Diff line
@@ -48,5 +48,6 @@ interface IKeyMintDevice { 
  void deviceLocked(in boolean passwordOnly, in @nullable android.hardware.security.secureclock.TimeStampToken timestampToken);

  void earlyBootEnded();

  byte[] convertStorageKeyToEphemeral(in byte[] storageKeyBlob);

  android.hardware.security.keymint.KeyCharacteristics[] getKeyCharacteristics(in byte[] keyBlob, in byte[] appId, in byte[] appData);

  const int AUTH_TOKEN_MAC_LENGTH = 32;

}

security/keymint/aidl/android/hardware/security/keymint/BeginResult.aidl

+4 −1
Original line number Diff line number Diff line
@@ -25,7 +25,10 @@ import android.hardware.security.keymint.KeyParameter; 
 */

@VintfStability

parcelable BeginResult {

    /* This is the challenge used in verifyAuthorization.  It must be a nonce. */

    /**

     * This is the challenge used to verify authorization of an operation.

     * See IKeyMintOperation.aidl entrypoints updateAad() and update().

     */

    long challenge;



    /**