Merge "Added missing header to window.h"
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 5d8a831..a1c3523 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -125,6 +125,8 @@
#define VENDOR_ID_INQ_MOBILE 0x2314
// Sony's USB Vendor ID
#define VENDOR_ID_SONY 0x054C
+// Lab126's USB Vendor ID
+#define VENDOR_ID_LAB126 0x1949
/** built-in vendor list */
int builtInVendorIds[] = {
@@ -173,6 +175,7 @@
VENDOR_ID_QUANTA,
VENDOR_ID_INQ_MOBILE,
VENDOR_ID_SONY,
+ VENDOR_ID_LAB126,
};
#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))
diff --git a/include/arch/linux-arm/AndroidConfig.h b/include/arch/linux-arm/AndroidConfig.h
index cae112b..7eba7d0 100644
--- a/include/arch/linux-arm/AndroidConfig.h
+++ b/include/arch/linux-arm/AndroidConfig.h
@@ -96,7 +96,7 @@
/*
* Define this if you have <termio.h>
*/
-#define HAVE_TERMIO_H
+#define HAVE_TERMIO_H 1
/*
* Define this if you have <sys/sendfile.h>
@@ -111,7 +111,7 @@
/*
* Define this if you have sys/uio.h
*/
-#define HAVE_SYS_UIO_H
+#define HAVE_SYS_UIO_H 1
/*
* Define this if your platforms implements symbolic links
diff --git a/include/arch/linux-ppc/AndroidConfig.h b/include/arch/linux-ppc/AndroidConfig.h
index 00706dc..2ec99f0 100644
--- a/include/arch/linux-ppc/AndroidConfig.h
+++ b/include/arch/linux-ppc/AndroidConfig.h
@@ -83,7 +83,7 @@
/*
* Define this if you have <termio.h>
*/
-#define HAVE_TERMIO_H
+#define HAVE_TERMIO_H 1
/*
* Define this if you have <sys/sendfile.h>
@@ -98,7 +98,7 @@
/*
* Define this if you have sys/uio.h
*/
-#define HAVE_SYS_UIO_H
+#define HAVE_SYS_UIO_H 1
/*
* Define this if your platforms implements symbolic links
diff --git a/include/arch/linux-sh/AndroidConfig.h b/include/arch/linux-sh/AndroidConfig.h
index 5562eae..f51caeb 100644
--- a/include/arch/linux-sh/AndroidConfig.h
+++ b/include/arch/linux-sh/AndroidConfig.h
@@ -96,7 +96,7 @@
/*
* Define this if you have <termio.h>
*/
-#define HAVE_TERMIO_H
+#define HAVE_TERMIO_H 1
/*
* Define this if you have <sys/sendfile.h>
@@ -111,7 +111,7 @@
/*
* Define this if you have sys/uio.h
*/
-#define HAVE_SYS_UIO_H
+#define HAVE_SYS_UIO_H 1
/*
* Define this if your platforms implements symbolic links
diff --git a/include/arch/linux-x86/AndroidConfig.h b/include/arch/linux-x86/AndroidConfig.h
index 7dcaa98..24e7797 100644
--- a/include/arch/linux-x86/AndroidConfig.h
+++ b/include/arch/linux-x86/AndroidConfig.h
@@ -83,7 +83,7 @@
/*
* Define this if you have <termio.h>
*/
-#define HAVE_TERMIO_H
+#define HAVE_TERMIO_H 1
/*
* Define this if you have <sys/sendfile.h>
@@ -98,7 +98,7 @@
/*
* Define this if you have sys/uio.h
*/
-#define HAVE_SYS_UIO_H
+#define HAVE_SYS_UIO_H 1
/*
* Define this if your platforms implements symbolic links
diff --git a/include/system/audio_policy.h b/include/system/audio_policy.h
index 1e0af7d..0194962 100644
--- a/include/system/audio_policy.h
+++ b/include/system/audio_policy.h
@@ -38,6 +38,9 @@
AUDIO_POLICY_OUTPUT_FLAG_DIRECT = 0x1
} audio_policy_output_flags_t;
+/* for future compatibility */
+typedef audio_policy_output_flags_t audio_output_flags_t;
+
/* device categories used for audio_policy->set_force_use() */
typedef enum {
AUDIO_POLICY_FORCE_NONE,
diff --git a/include/system/graphics.h b/include/system/graphics.h
index 729e92c..d42a0d3 100644
--- a/include/system/graphics.h
+++ b/include/system/graphics.h
@@ -86,7 +86,8 @@
*/
HAL_PIXEL_FORMAT_YV12 = 0x32315659, // YCrCb 4:2:0 Planar
-
+ /* Forward compatibility */
+ HAL_PIXEL_FORMAT_RAW_SENSOR = 0x20,
/* Legacy formats (deprecated), used by ImageFormat.java */
HAL_PIXEL_FORMAT_YCbCr_422_SP = 0x10, // NV16
diff --git a/init/builtins.c b/init/builtins.c
index 9aa2345..ad52b19 100644
--- a/init/builtins.c
+++ b/init/builtins.c
@@ -273,6 +273,7 @@
unsigned flag;
} mount_flags[] = {
{ "noatime", MS_NOATIME },
+ { "noexec", MS_NOEXEC },
{ "nosuid", MS_NOSUID },
{ "nodev", MS_NODEV },
{ "nodiratime", MS_NODIRATIME },
diff --git a/libpixelflinger/fixed.cpp b/libpixelflinger/fixed.cpp
index 5b92062..5094537 100644
--- a/libpixelflinger/fixed.cpp
+++ b/libpixelflinger/fixed.cpp
@@ -62,7 +62,8 @@
int shift;
x = gglRecipQNormalized(x, &shift);
shift += 16-q;
- x += 1L << (shift-1); // rounding
+ if (shift > 0)
+ x += 1L << (shift-1); // rounding
x >>= shift;
return x;
}
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 28cd26c..236c97b 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -414,7 +414,7 @@
service zygote /system/bin/app_process -Xzygote /system/bin --zygote --start-system-server
class main
- socket zygote stream 666
+ socket zygote stream 660 root system
onrestart write /sys/android_power/request_state wake
onrestart write /sys/power/state on
onrestart restart media
