1 files changed, 10 insertions, 9 deletions
diff --git a/services/java/com/android/server/input/InputManagerService.java b/services/java/com/android/server/input/InputManagerService.java
index aece7d2..117e064 100644
--- a/services/java/com/android/server/input/InputManagerService.java
+++ b/services/java/com/android/server/input/InputManagerService.java
@@ -162,7 +162,6 @@ public class InputManagerService extends IInputManager.Stub implements Watchdog.
     private static native void nativeSetSystemUiVisibility(int ptr, int visibility);
     private static native void nativeSetFocusedApplication(int ptr,
             InputApplicationHandle application);
-    private static native void nativeGetInputConfiguration(int ptr, Configuration configuration);
     private static native boolean nativeTransferTouchFocus(int ptr,
             InputChannel fromChannel, InputChannel toChannel);
     private static native void nativeSetPointerSpeed(int ptr, int speed);
@@ -298,14 +297,6 @@ public class InputManagerService extends IInputManager.Stub implements Watchdog.
         }
         nativeSetDisplayOrientation(mPtr, displayId, rotation);
     }
-    
-    public void getInputConfiguration(Configuration config) {
-        if (config == null) {
-            throw new IllegalArgumentException("config must not be null.");
-        }
-        
-        nativeGetInputConfiguration(mPtr, config);
-    }
 
     /**
      * Gets the current state of a key or button by key code.
@@ -522,6 +513,16 @@ public class InputManagerService extends IInputManager.Stub implements Watchdog.
         }
     }
 
+    /**
+     * Gets all input devices in the system.
+     * @return The array of input devices.
+     */
+    public InputDevice[] getInputDevices() {
+        synchronized (mInputDevicesLock) {
+            return mInputDevices;
+        }
+    }
+
     @Override // Binder call
     public void registerInputDevicesChangedListener(IInputDevicesChangedListener listener) {
         if (listener == null) {