commit 4e74882a805088cf75839bf0df7eb13485b8b27a
author The Android Automerger <android-build@android.com> Wed Mar 13 05:56:15 2013 -0700
committer The Android Automerger <android-build@android.com> Wed Mar 13 05:56:15 2013 -0700
tree 4c7ebaae79fab35c06cfaaddea8ddec0594e9b13
parent 91535cff09af5b0181bffe64e97dcae9d24ba219
parent eba780c92396fd0b90e9ee481aae060ba8d18046

merge in jb-mr2-release history after reset to jb-mr2-dev

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 3a8e8fd..df9b1d1 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -131,6 +131,12 @@
 #define VENDOR_ID_KOBO          0x2237
 // Teleepoch's USB Vendor ID
 #define VENDOR_ID_TELEEPOCH     0x2340
+// AnyDATA's USB Vendor ID
+#define VENDOR_ID_ANYDATA       0x16D5
+// Harris's USB Vendor ID
+#define VENDOR_ID_HARRIS        0x19A5
+// OPPO's USB Vendor ID
+#define VENDOR_ID_OPPO          0x22D9
 
 
 /** built-in vendor list */
@@ -183,6 +189,9 @@
     VENDOR_ID_YULONG_COOLPAD,
     VENDOR_ID_KOBO,
     VENDOR_ID_TELEEPOCH,
+    VENDOR_ID_ANYDATA,
+    VENDOR_ID_HARRIS,
+    VENDOR_ID_OPPO,
 };
 
 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))

logwrapper/logwrap.c

diff --git a/logwrapper/logwrap.c b/logwrapper/logwrap.c
index d9247ec..b2abfe2 100644
--- a/logwrapper/logwrap.c
+++ b/logwrapper/logwrap.c
@@ -79,9 +79,7 @@
     pthread_sigmask(SIG_UNBLOCK, &chldset, NULL);
 
     while (!found_child) {
-        if (poll(poll_fds, remote_hung ? 1 : 2, -1) < 0) {
-            if (errno == EINTR)
-                continue;
+        if (TEMP_FAILURE_RETRY(poll(poll_fds, remote_hung ? 1 : 2, -1)) < 0) {
             ERROR("poll failed\n");
             rc = -1;
             goto err_poll;
@@ -132,9 +130,7 @@
 
             read(signal_fd, tmp, sizeof(tmp));
             while (!found_child) {
-                do {
-                    ret = waitpid(-1, &status, WNOHANG);
-                } while (ret < 0 && errno == EINTR);
+                ret = TEMP_FAILURE_RETRY(waitpid(-1, &status, WNOHANG));
 
                 if (ret <= 0)
                     break;

mkbootimg/mkbootimg.c

diff --git a/mkbootimg/mkbootimg.c b/mkbootimg/mkbootimg.c
index 2c32ce3..34a879b 100644
--- a/mkbootimg/mkbootimg.c
+++ b/mkbootimg/mkbootimg.c
@@ -72,7 +72,7 @@
 
 
 
-static unsigned char padding[4096] = { 0, };
+static unsigned char padding[16384] = { 0, };
 
 int write_padding(int fd, unsigned pagesize, unsigned itemsize)
 {
@@ -152,7 +152,8 @@
             board = val;
         } else if(!strcmp(arg,"--pagesize")) {
             pagesize = strtoul(val, 0, 10);
-            if ((pagesize != 2048) && (pagesize != 4096)) {
+            if ((pagesize != 2048) && (pagesize != 4096)
+                && (pagesize != 8192) && (pagesize != 16384)) {
                 fprintf(stderr,"error: unsupported page size %d\n", pagesize);
                 return -1;
             }