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

Commit edc69af0 authored by Jesus Sanchez-Palencia's avatar Jesus Sanchez-Palencia Committed by Automerger Merge Worker
Browse files

Merge changes from topic "lights-aidl-rust-derive" am: 5cf8e8e2 am:...

Merge changes from topic "lights-aidl-rust-derive" am: 5cf8e8e2 am: f3068ac9 am: 54ef99bb am: 73b0e4be am: a358ece7

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



Change-Id: I4e5eeb117b552b4fb90c28ea16b3a56597e5c3e9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3098543f a358ece7
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
c8b1e8ebb88c57dcb2c350a8d9b722e77dd864c8
c7d3d941d303c70d1c22759a0b09e41930c1cddb
+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@
// later when a module using the interface is updated, e.g., Mainline modules.

package android.hardware.light;
@VintfStability
@RustDerive(Clone=true, Copy=true) @VintfStability
parcelable HwLight {
  int id;
  int ordinal;
+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@
// later when a module using the interface is updated, e.g., Mainline modules.

package android.hardware.light;
@VintfStability
@RustDerive(Clone=true, Copy=true) @VintfStability
parcelable HwLightState {
  int color;
  android.hardware.light.FlashMode flashMode;
+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@
// later when a module using the interface is updated, e.g., Mainline modules.

package android.hardware.light;
@VintfStability
@RustDerive(Clone=true, Copy=true) @VintfStability
parcelable HwLight {
  int id;
  int ordinal;
+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@
// later when a module using the interface is updated, e.g., Mainline modules.

package android.hardware.light;
@VintfStability
@RustDerive(Clone=true, Copy=true) @VintfStability
parcelable HwLightState {
  int color;
  android.hardware.light.FlashMode flashMode;
Loading