コミット: e789da8eb2ac19413e735488bb8e48502beffe59 - frameworks-base (git)

frameworks/base

コミットメタ情報

• リビジョン: e789da8eb2ac19413e735488bb8e48502beffe59 (tree)
• 日時: 2014-08-27 19:19:17
• 作者: Chih-Wei Huang <cwhuang@linu...>
• コミッター: Chih-Wei Huang

ログメッセージ

InputReader: read the pointercal from TSCalibration2

Watch the pointercal and reload it on changed.

変更サマリ

• modified: services/input/InputReader.cpp
• modified: services/java/com/android/server/input/InputManagerService.java

差分

--- a/services/input/InputReader.cpp
+++ b/services/input/InputReader.cpp
@@ -2757,6 +2757,19 @@ void TouchInputMapper::configure(nsecs_t when,
         configureSurface(when, &resetNeeded);
     }
 
+    if (!changes || (changes & InputReaderConfiguration::CHANGE_DEVICE_ALIAS)) {
+        // Get 5-point calibration parameters
+        int *p = mCalibration.fiveCal;
+        p[6] = 0;
+        if (FILE *file = fopen("/data/misc/tscal/pointercal", "r")) {
+            if (fscanf(file, "%d %d %d %d %d %d %d", &p[0], &p[1], &p[2], &p[3], &p[4], &p[5], &p[6]) == 7) {
+                p[0] *= mXScale, p[1] *= mYScale, p[3] *= mXScale, p[4] *= mYScale;
+                ALOGD("pointercal loaded ok");
+            }
+            fclose(file);
+        }
+    }
+
     if (changes && resetNeeded) {
         // Send reset, unless this is the first time the device has been configured,
         // in which case the reader will call reset itself after all mappers are ready.
@@ -3479,16 +3492,6 @@ void TouchInputMapper::parseCalibration() {
                     coverageCalibrationString.string());
         }
     }
-
-    // Get 5-point calibration parameters
-    FILE *file = fopen("/data/system/tslib/pointercal", "r");
-    int *p = out.fiveCal;
-    if (file) {
-        fscanf(file, "%d %d %d %d %d %d %d", &p[0], &p[1], &p[2], &p[3], &p[4], &p[5], &p[6]);
-        fclose(file);
-    } else {
-        p[6] = 0;
-    }
 }
 
 void TouchInputMapper::resolveCalibration() {

--- a/services/java/com/android/server/input/InputManagerService.java
+++ b/services/java/com/android/server/input/InputManagerService.java
@@ -51,6 +51,7 @@ import android.hardware.input.KeyboardLayout;
 import android.os.Binder;
 import android.os.Bundle;
 import android.os.Environment;
+import android.os.FileObserver;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
@@ -241,6 +242,19 @@ public class InputManagerService extends IInputManager.Stub
     /** Whether to use the dev/input/event or uevent subsystem for the audio jack. */
     final boolean mUseDevInputEventForAudioJack;
 
+    private class TscalObserver extends FileObserver {
+        public TscalObserver() {
+            super("/data/misc/tscal/pointercal", CLOSE_WRITE);
+        }
+
+        @Override
+        public void onEvent(int event, String path) {
+            Slog.i(TAG, "detect pointercal changed");
+            reloadDeviceAliases();
+        }
+    }
+    private final TscalObserver mTscalObserver = new TscalObserver();
+
     public InputManagerService(Context context, Handler handler) {
         this.mContext = context;
         this.mHandler = new InputManagerHandler(handler.getLooper());
@@ -250,6 +264,7 @@ public class InputManagerService extends IInputManager.Stub
         Slog.i(TAG, "Initializing input manager, mUseDevInputEventForAudioJack="
                 + mUseDevInputEventForAudioJack);
         mPtr = nativeInit(this, mContext, mHandler.getLooper().getQueue());
+        mTscalObserver.startWatching();
     }
 
     public void setWindowManagerCallbacks(WindowManagerCallbacks callbacks) {