commit 3002b8a74431dd7c005269cf9306443a4b4963f1
author Kevin Schoedel <kpschoedel@google.com> Mon Mar 06 14:34:39 2017 -0500
committer Kevin Schoedel <kpschoedel@google.com> Tue Mar 07 15:37:09 2017 -0500
tree 2140ca96c2f322d47e1a2d68ec966ccd391d63be
parent 198cf8e53582f69239fdbcc51fcf252009cf6e3e

Interface for multiple virtual touchpads.

This passes the touchpad selection across binder, but does not yet
actually implement multiple touchpad devices.

Bug: b/35992608
Test: primary only in VirtualTouchpad_test
Change-Id: I7529735362e0e38805b9c0e52e07b5efc86bd535

services/vr/virtual_touchpad/VirtualTouchpadClient.cpp

diff --git a/services/vr/virtual_touchpad/VirtualTouchpadClient.cpp b/services/vr/virtual_touchpad/VirtualTouchpadClient.cpp
index 23a2e31..175173f 100644
--- a/services/vr/virtual_touchpad/VirtualTouchpadClient.cpp
+++ b/services/vr/virtual_touchpad/VirtualTouchpadClient.cpp
@@ -12,19 +12,20 @@
  public:
   VirtualTouchpadClientImpl(sp<IVirtualTouchpadService> service)
       : service_(service) {}
-  ~VirtualTouchpadClientImpl() {}
+  ~VirtualTouchpadClientImpl() override {}
 
-  status_t Touch(float x, float y, float pressure) override {
+  status_t Touch(int touchpad,
+                 float x, float y, float pressure) override {
     if (service_ == nullptr) {
       return NO_INIT;
     }
-    return service_->touch(x, y, pressure).transactionError();
+    return service_->touch(touchpad, x, y, pressure).transactionError();
   }
-  status_t ButtonState(int buttons) override {
+  status_t ButtonState(int touchpad, int buttons) override {
     if (service_ == nullptr) {
       return NO_INIT;
     }
-    return service_->buttonState(buttons).transactionError();
+    return service_->buttonState(touchpad, buttons).transactionError();
   }
 
  private: