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

Commit 5235704a authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge changes from topic "fix-aidl-warnings" am: a886a5c4 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1688165

Change-Id: I9d3dadf3247491b7c1edf100d1fbd7e8fc0790a9
parents 409dfb7f a886a5c4

graphics/common/aidl/aidl_api/android.hardware.graphics.common/current/android/hardware/graphics/common/HardwareBufferDescription.aidl

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ parcelable HardwareBufferDescription { 
  int width;

  int height;

  int layers;

  android.hardware.graphics.common.PixelFormat format;

  android.hardware.graphics.common.BufferUsage usage;

  android.hardware.graphics.common.PixelFormat format = android.hardware.graphics.common.PixelFormat.UNSPECIFIED;

  android.hardware.graphics.common.BufferUsage usage = android.hardware.graphics.common.BufferUsage.CPU_READ_NEVER;

  int stride;

}

graphics/common/aidl/android/hardware/graphics/common/HardwareBufferDescription.aidl

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ parcelable HardwareBufferDescription { 
    int width;

    int height;

    int layers;

    PixelFormat format;

    BufferUsage usage;

    PixelFormat format = PixelFormat.UNSPECIFIED;

    BufferUsage usage = BufferUsage.CPU_READ_NEVER;

    int stride;

}

keymaster/aidl/aidl_api/android.hardware.keymaster/current/android/hardware/keymaster/HardwareAuthToken.aidl

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ parcelable HardwareAuthToken { 
  long challenge;

  long userId;

  long authenticatorId;

  android.hardware.keymaster.HardwareAuthenticatorType authenticatorType;

  android.hardware.keymaster.HardwareAuthenticatorType authenticatorType = android.hardware.keymaster.HardwareAuthenticatorType.NONE;

  android.hardware.keymaster.Timestamp timestamp;

  byte[] mac;

}

keymaster/aidl/aidl_api/android.hardware.keymaster/current/android/hardware/keymaster/VerificationToken.aidl

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ package android.hardware.keymaster; 
parcelable VerificationToken {

  long challenge;

  android.hardware.keymaster.Timestamp timestamp;

  android.hardware.keymaster.SecurityLevel securityLevel;

  android.hardware.keymaster.SecurityLevel securityLevel = android.hardware.keymaster.SecurityLevel.SOFTWARE;

  byte[] mac;

}

keymaster/aidl/android/hardware/keymaster/HardwareAuthToken.aidl

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ parcelable HardwareAuthToken { 
     * authenticatorType describes the type of authentication that took place, e.g. password or

     * fingerprint.

     */

    HardwareAuthenticatorType authenticatorType;

    HardwareAuthenticatorType authenticatorType = HardwareAuthenticatorType.NONE;



    /**

     * timestamp indicates when the user authentication took place, in milliseconds since some