initial version

[android_pandora.git] / patches / all.patch

project frameworks/base/
diff --git a/frameworks/base/libs/ui/InputReader.cpp b/frameworks/base/libs/ui/InputReader.cpp
index 79cb87a..d8cd717 100644
--- a/frameworks/base/libs/ui/InputReader.cpp
+++ b/frameworks/base/libs/ui/InputReader.cpp
@@ -1668,12 +1668,36 @@ bool TouchInputMapper::configureSurfaceLocked() {
 
         // Configure X and Y factors.
         if (mRawAxes.x.valid && mRawAxes.y.valid) {
-            mLocked.xOrigin = mRawAxes.x.minValue;
-            mLocked.yOrigin = mRawAxes.y.minValue;
-            mLocked.xScale = float(width) / mRawAxes.x.getRange();
-            mLocked.yScale = float(height) / mRawAxes.y.getRange();
-            mLocked.xPrecision = 1.0f / mLocked.xScale;
-            mLocked.yPrecision = 1.0f / mLocked.yScale;
+            int a[7], have_pointercal = 0;
+            const char *fname = "/vendor/pointercal";
+            FILE *f = fopen(fname, "r");
+            int ret;
+            if (f) {
+              ret = fscanf(f, "%d %d %d %d %d %d %d",
+                &a[0], &a[1], &a[2], &a[3], &a[4], &a[5], &a[6]);
+              if (ret == 7)
+                have_pointercal = 1;
+              else
+                LOGW("Failed to parse %s", fname);
+              fclose(f);
+            }
+            else
+              LOGW("Failed to open %s", fname);
+
+            if (have_pointercal) {
+                mLocked.xScale = float(a[0]) / float(a[6]);
+                mLocked.yScale = float(a[4]) / float(a[6]);
+		// a[2] / mLocked.xScale / a[6]
+                mLocked.xOrigin = -a[2] / a[0];
+                mLocked.yOrigin = -a[5] / a[4];
+            } else {
+                mLocked.xOrigin = mRawAxes.x.minValue;
+                mLocked.yOrigin = mRawAxes.y.minValue;
+                mLocked.xScale = float(width) / mRawAxes.x.getRange();
+                mLocked.yScale = float(height) / mRawAxes.y.getRange();
+            }
+            mLocked.xPrecision = fabsf(1.0f / mLocked.xScale);
+            mLocked.yPrecision = fabsf(1.0f / mLocked.yScale);
 
             configureVirtualKeysLocked();
         } else {
@@ -1689,7 +1713,7 @@ bool TouchInputMapper::configureSurfaceLocked() {
         // Scale factor for terms that are not oriented in a particular axis.
         // If the pixels are square then xScale == yScale otherwise we fake it
         // by choosing an average.
-        mLocked.geometricScale = avg(mLocked.xScale, mLocked.yScale);
+        mLocked.geometricScale = avg(fabsf(mLocked.xScale), fabsf(mLocked.yScale));
 
         // Size of diagonal axis.
         float diagonalSize = pythag(width, height);

project hardware/libhardware/
diff --git a/hardware/libhardware/modules/gralloc/framebuffer.cpp b/hardware/libhardware/modules/gralloc/framebuffer.cpp
index fe57a8a..b5465e4 100644
--- a/hardware/libhardware/modules/gralloc/framebuffer.cpp
+++ b/hardware/libhardware/modules/gralloc/framebuffer.cpp
@@ -109,6 +109,12 @@ static int fb_post(struct framebuffer_device_t* dev, buffer_handle_t buffer)
         }
         m->currentBuffer = buffer;
         
+#ifndef FBIO_WAITFORVSYNC
+#define FBIO_WAITFORVSYNC _IOW ('F', 32, unsigned int)
+#endif
+        int mode = 0;
+        ioctl(m->framebuffer->fd, FBIO_WAITFORVSYNC, &mode);
+
     } else {
         // If we can't do the page_flip, just copy the buffer to the front 
         // FIXME: use copybit HAL instead of memcpy

project system/core/
diff --git a/system/core/libsysutils/src/NetlinkListener.cpp b/system/core/libsysutils/src/NetlinkListener.cpp
index fb088e1..f99227c 100644
--- a/system/core/libsysutils/src/NetlinkListener.cpp
+++ b/system/core/libsysutils/src/NetlinkListener.cpp
@@ -45,21 +45,21 @@ bool NetlinkListener::onDataAvailable(SocketClient *cli)
     }
 
     if ((snl.nl_groups != 1) || (snl.nl_pid != 0)) {
-        SLOGE("ignoring non-kernel netlink multicast message");
-        return false;
+        //SLOGE("ignoring non-kernel netlink multicast message");
+        return true;
     }
 
     struct cmsghdr * cmsg = CMSG_FIRSTHDR(&hdr);
 
     if (cmsg == NULL || cmsg->cmsg_type != SCM_CREDENTIALS) {
         SLOGE("ignoring message with no sender credentials");
-        return false;
+        return true;
     }
 
     struct ucred * cred = (struct ucred *)CMSG_DATA(cmsg);
     if (cred->uid != 0) {
         SLOGE("ignoring message from non-root UID %d", cred->uid);
-        return false;
+        return true;
     }
 
     NetlinkEvent *evt = new NetlinkEvent();

project system/extras/
diff --git a/system/extras/su/su.c b/system/extras/su/su.c
index b87cece..bddc37d 100644
--- a/system/extras/su/su.c
+++ b/system/extras/su/su.c
@@ -59,10 +59,12 @@ int main(int argc, char **argv)
 
     /* Until we have something better, only root and the shell can use su. */
     myuid = getuid();
+#if 0
     if (myuid != AID_ROOT && myuid != AID_SHELL) {
         fprintf(stderr,"su: uid %d not allowed to su\n", myuid);
         return 1;
     }
+#endif
     
     if(setgid(gid) || setuid(uid)) {
         fprintf(stderr,"su: permission denied\n");