switch to alsa.omap3 module

[android_pandora.git] / patches / all.patch

project external/hostap/
diff --git a/external/hostap/Android.mk b/external/hostap/Android.mk
index 77d72ea..5c6b589 100644
--- a/external/hostap/Android.mk
+++ b/external/hostap/Android.mk
@@ -1,3 +1,5 @@
 ifeq ($(WPA_SUPPLICANT_VERSION),VER_0_8_X)
-    include $(call all-subdir-makefiles)
+    #include $(call all-subdir-makefiles)
+    LOCAL_PATH := $(call my-dir)
+    include $(LOCAL_PATH)/wpa_supplicant/Android.mk
 endif
diff --git a/external/hostap/wpa_supplicant/config-android b/external/hostap/wpa_supplicant/config-android
index c71056c..2532ccd 100644
--- a/external/hostap/wpa_supplicant/config-android
+++ b/external/hostap/wpa_supplicant/config-android
@@ -81,7 +81,7 @@
 CONFIG_DRIVER_WEXT=y
 
 # Driver interface for Linux drivers using the nl80211 kernel interface
-CONFIG_DRIVER_NL80211=y
+#CONFIG_DRIVER_NL80211=y
 
 # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
 #CONFIG_DRIVER_BSD=y

project external/openssl/
diff --git a/external/openssl/crypto/Android.mk b/external/openssl/crypto/Android.mk
index 222bc96..f2361a5 100644
--- a/external/openssl/crypto/Android.mk
+++ b/external/openssl/crypto/Android.mk
@@ -155,6 +155,7 @@ local_src_files := \
 	bn/bn_sqr.c \
 	bn/bn_sqrt.c \
 	bn/bn_word.c \
+	bn/bn_const.c \
 	buffer/buf_err.c \
 	buffer/buffer.c \
 	comp/c_rle.c \

project frameworks/base/
diff --git a/frameworks/base/libs/ui/InputReader.cpp b/frameworks/base/libs/ui/InputReader.cpp
index 7626b15..16e17b3 100644
--- a/frameworks/base/libs/ui/InputReader.cpp
+++ b/frameworks/base/libs/ui/InputReader.cpp
@@ -1468,12 +1468,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 {
@@ -1489,7 +1513,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);
diff --git a/frameworks/base/services/java/com/android/server/PowerManagerService.java b/frameworks/base/services/java/com/android/server/PowerManagerService.java
index 44eb228..9444fad 100644
--- a/frameworks/base/services/java/com/android/server/PowerManagerService.java
+++ b/frameworks/base/services/java/com/android/server/PowerManagerService.java
@@ -766,7 +766,8 @@ class PowerManagerService extends IPowerManager.Stub
     }
 
     private void updateWakeLockLocked() {
-        if (mStayOnConditions != 0 && mBatteryService.isPowered(mStayOnConditions)) {
+        /* pandora hack: screenoff breakage workaround */
+        if (true || mStayOnConditions != 0 && mBatteryService.isPowered(mStayOnConditions)) {
             // keep the device on if we're plugged in and mStayOnWhilePluggedIn is set.
             mStayOnWhilePluggedInScreenDimLock.acquire();
             mStayOnWhilePluggedInPartialLock.acquire();

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 hardware/libhardware_legacy/
diff --git a/hardware/libhardware_legacy/power/power.c b/hardware/libhardware_legacy/power/power.c
index bca52fc..2ffadfa 100644
--- a/hardware/libhardware_legacy/power/power.c
+++ b/hardware/libhardware_legacy/power/power.c
@@ -254,6 +254,9 @@ set_screen_state(int on)
     //LOGI("go_to_sleep eventTime=%lld now=%lld g_error=%s\n", eventTime,
       //      systemTime(), strerror(g_error));
 
+    // pandora hack
+    return 0;
+
     if (g_error) return g_error;
 
     char buf[32];
diff --git a/hardware/libhardware_legacy/wifi/wifi.c b/hardware/libhardware_legacy/wifi/wifi.c
index 167402b..4e03740 100644
--- a/hardware/libhardware_legacy/wifi/wifi.c
+++ b/hardware/libhardware_legacy/wifi/wifi.c
@@ -695,17 +695,40 @@ int wifi_connect_to_supplicant()
     return 0;
 }
 
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include <net/if.h>
+
 int wifi_send_command(struct wpa_ctrl *ctrl, const char *cmd, char *reply, size_t *reply_len)
 {
     int ret;
 
+    int sock = socket(AF_INET, SOCK_DGRAM, 0);    
+    if (sock != -1) {
+        struct ifreq ifr;
+        memset(&ifr, 0, sizeof(ifr));
+        strcpy(ifr.ifr_name, "wlan0");
+
+        if (ioctl(sock, SIOCGIFFLAGS, &ifr) == 0) {
+            if (!(ifr.ifr_flags & IFF_UP)) {
+                LOGE("wlan0 is down - attempting to bring up..\n");
+                ifr.ifr_flags |= IFF_UP;
+                if (ioctl(sock, SIOCSIFFLAGS, &ifr) == 0)
+                    LOGE("wlan0 brought up\n");
+            }
+        }
+        close(sock);
+    }
+
     if (ctrl_conn == NULL) {
-        LOGV("Not connected to wpa_supplicant - \"%s\" command dropped.\n", cmd);
+        LOGE("Not connected to wpa_supplicant - \"%s\" command dropped.\n", cmd);
         return -1;
     }
     ret = wpa_ctrl_request(ctrl, cmd, strlen(cmd), reply, reply_len, NULL);
     if (ret == -2) {
-        LOGD("'%s' command timed out.\n", cmd);
+        LOGE("'%s' command timed out.\n", cmd);
         return -2;
     } else if (ret < 0 || strncmp(reply, "FAIL", 4) == 0) {
         return -1;

project hardware/ti/omap3/
diff --git a/hardware/ti/omap3/Android.mk b/hardware/ti/omap3/Android.mk
index d2171bf..059ea3e 100644
--- a/hardware/ti/omap3/Android.mk
+++ b/hardware/ti/omap3/Android.mk
@@ -1,4 +1,7 @@
 # make sure the omap3 HAL code doesn't get picked up by non-omap boards
 ifeq ($(OMAP_ENHANCEMENT),true)
 include $(call first-makefiles-under,$(call my-dir))
+else
+    LOCAL_PATH := $(call my-dir)
+    include $(LOCAL_PATH)/modules/alsa/Android.mk
 endif

project packages/providers/MediaProvider/
diff --git a/packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java b/packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java
index 146966f..3938841 100644
--- a/packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java
+++ b/packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java
@@ -3317,8 +3317,9 @@ public class MediaProvider extends ContentProvider {
                             Log.i(TAG, "External storage is not (yet) mounted, cannot attach volume.");
                         }
 
-                        throw new IllegalArgumentException("Unable to obtain external storage volume ID for " +
-                                volume + " volume.");
+                        // pandora hack: ignore for now, like older Android did
+                        //throw new IllegalArgumentException("Unable to obtain external storage volume ID for " +
+                        //        volume + " volume.");
                     }
 
                     // generate database name based on volume ID

project system/core/
diff --git a/system/core/init/devices.c b/system/core/init/devices.c
index 04f2caf..5affc06 100644
--- a/system/core/init/devices.c
+++ b/system/core/init/devices.c
@@ -572,6 +572,9 @@ static void handle_firmware_event(struct uevent *uevent)
     int status;
     int ret;
 
+    // pandora hack: udev is handling this for us
+    return;
+
     if(strcmp(uevent->subsystem, "firmware"))
         return;
 
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();