2 files changed, 7 insertions, 6 deletions
diff --git a/core/java/android/hardware/input/IInputManager.aidl b/core/java/android/hardware/input/IInputManager.aidl
index 4214115..465d142 100644
--- a/core/java/android/hardware/input/IInputManager.aidl
+++ b/core/java/android/hardware/input/IInputManager.aidl
@@ -41,8 +41,8 @@ interface IInputManager {
     boolean injectInputEvent(in InputEvent ev, int mode);
 
     // Calibrate input device position
-    TouchCalibration getTouchCalibrationForInputDevice(String inputDeviceDescriptor);
-    void setTouchCalibrationForInputDevice(String inputDeviceDescriptor,
+    TouchCalibration getTouchCalibrationForInputDevice(String inputDeviceDescriptor, int rotation);
+    void setTouchCalibrationForInputDevice(String inputDeviceDescriptor, int rotation,
             in TouchCalibration calibration);
 
     // Keyboard layouts configuration.
diff --git a/core/java/android/hardware/input/InputManager.java b/core/java/android/hardware/input/InputManager.java
index ece5d82..e3a3830 100644
--- a/core/java/android/hardware/input/InputManager.java
+++ b/core/java/android/hardware/input/InputManager.java
@@ -508,9 +508,9 @@ public final class InputManager {
      *
      * @hide
      */
-    public TouchCalibration getTouchCalibration(String inputDeviceDescriptor) {
+    public TouchCalibration getTouchCalibration(String inputDeviceDescriptor, int surfaceRotation) {
         try {
-            return mIm.getTouchCalibrationForInputDevice(inputDeviceDescriptor);
+            return mIm.getTouchCalibrationForInputDevice(inputDeviceDescriptor, surfaceRotation);
         } catch (RemoteException ex) {
             Log.w(TAG, "Could not get calibration matrix for input device.", ex);
             return TouchCalibration.IDENTITY;
@@ -529,9 +529,10 @@ public final class InputManager {
      *
      * @hide
      */
-    public void setTouchCalibration(String inputDeviceDescriptor, TouchCalibration calibration) {
+    public void setTouchCalibration(String inputDeviceDescriptor, int surfaceRotation,
+            TouchCalibration calibration) {
         try {
-            mIm.setTouchCalibrationForInputDevice(inputDeviceDescriptor, calibration);
+            mIm.setTouchCalibrationForInputDevice(inputDeviceDescriptor, surfaceRotation, calibration);
         } catch (RemoteException ex) {
             Log.w(TAG, "Could not set calibration matrix for input device.", ex);
         }