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

Commit bcd43f5f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "lights aidl: Add required @Rust derive statements" into... 

Merge "lights aidl: Add required @Rust derive statements" into android14-tests-dev am: f270275c am: 46540f28

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



Change-Id: I9751ad3e4a99091ad88941de0793ac3b12b740a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 68139568 46540f28

light/aidl/aidl_api/android.hardware.light/2/.hash

+1 −0
Original line number Original line Diff line number Diff line 
c8b1e8ebb88c57dcb2c350a8d9b722e77dd864c8

c8b1e8ebb88c57dcb2c350a8d9b722e77dd864c8

c7d3d941d303c70d1c22759a0b09e41930c1cddb

light/aidl/aidl_api/android.hardware.light/2/android/hardware/light/HwLight.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ 
// later when a module using the interface is updated, e.g., Mainline modules.

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





package android.hardware.light;

package android.hardware.light;

@VintfStability

@RustDerive(Clone=true, Copy=true) @VintfStability

parcelable HwLight {

parcelable HwLight {

  int id;

  int id;

  int ordinal;

  int ordinal;

light/aidl/aidl_api/android.hardware.light/2/android/hardware/light/HwLightState.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ 
// later when a module using the interface is updated, e.g., Mainline modules.

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





package android.hardware.light;

package android.hardware.light;

@VintfStability

@RustDerive(Clone=true, Copy=true) @VintfStability

parcelable HwLightState {

parcelable HwLightState {

  int color;

  int color;

  android.hardware.light.FlashMode flashMode;

  android.hardware.light.FlashMode flashMode;

light/aidl/aidl_api/android.hardware.light/current/android/hardware/light/HwLight.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ 
// later when a module using the interface is updated, e.g., Mainline modules.

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





package android.hardware.light;

package android.hardware.light;

@VintfStability

@RustDerive(Clone=true, Copy=true) @VintfStability

parcelable HwLight {

parcelable HwLight {

  int id;

  int id;

  int ordinal;

  int ordinal;

light/aidl/aidl_api/android.hardware.light/current/android/hardware/light/HwLightState.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ 
// later when a module using the interface is updated, e.g., Mainline modules.

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





package android.hardware.light;

package android.hardware.light;

@VintfStability

@RustDerive(Clone=true, Copy=true) @VintfStability

parcelable HwLightState {

parcelable HwLightState {

  int color;

  int color;

  android.hardware.light.FlashMode flashMode;

  android.hardware.light.FlashMode flashMode;