commit fae03b957bbf98c62b2e04c73a97bf3e692a5591
author Nick Desaulniers <ndesaulniers@google.com> Thu Oct 17 01:18:15 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 17 01:18:15 2019 -0700
tree c9fe4913823ca51183161fb40599c033ac2f21d7
parent 37669aa4f9f416084ea313b739edb43980a96cb9
parent ffbe5b86c38ad42b02a989221fa832c4af3ada65

Merge "[inputflinger] fix -Wreorder-init-list" am: c932e4472f am: eb013d0f82 am: 9d9321bf0e
am: ffbe5b86c3

Change-Id: Idb1dc955b8c54f39cb8fc27b6ffc454628b1c25e

services/inputflinger/host/InputDriver.cpp

diff --git a/services/inputflinger/host/InputDriver.cpp b/services/inputflinger/host/InputDriver.cpp
index 2f046c3..683c05d 100644
--- a/services/inputflinger/host/InputDriver.cpp
+++ b/services/inputflinger/host/InputDriver.cpp
@@ -127,10 +127,10 @@
             input_bus_t bus, const char* uniqueId) {
     auto identifier = new ::input_device_identifier {
         .name = name,
-        .productId = productId,
-        .vendorId = vendorId,
-        .bus = bus,
         .uniqueId = uniqueId,
+        .bus = bus,
+        .vendorId = vendorId,
+        .productId = productId,
     };
     // TODO: store this identifier somewhere
     return identifier;