commit a02ff986fc0fe5543bb2168814eee04eac8ef579
author Colin Cross <ccross@android.com> Thu Apr 26 18:10:21 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Thu Apr 26 18:10:21 2012 -0700
tree 9dce7e049769aa824deff68534a83cdc56c967d6
parent 5b3eb07ed730f9765c93afcb7f49559c212fe533
parent b6ee25e3ad4cffa2b0f5bb734df4b503e1e367ba

Merge "init: Add noexec mount option"

include/system/audio_policy.h

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,

include/system/graphics.h

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

libpixelflinger/fixed.cpp

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;
 }