commit 102a072d900d56c54ced6144666d35e373fe84b1
author Jesse Hall <jessehall@google.com> Thu May 22 04:43:19 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 22 04:43:19 2014 +0000
tree 974fdf47c28e2c38c90d5e22bc44b0dc3f6f87f6
parent 72aa92381afa5d6dd467dac909ac340de3cce849
parent 391109083f683c990bdbc5ca3a5f521a9a3fc98d

Merge "opengl: Fix include style in generated JNI code"

include/input/InputEventLabels.h

diff --git a/include/input/InputEventLabels.h b/include/input/InputEventLabels.h
index 47b23cb..51f7661 100644
--- a/include/input/InputEventLabels.h
+++ b/include/input/InputEventLabels.h
@@ -345,6 +345,7 @@
 };
 
 static const InputEventLabel FLAGS[] = {
+    DEFINE_FLAG(VIRTUAL),
     DEFINE_FLAG(FUNCTION),
 
     { NULL, 0 }

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 51c7059..c3b2159 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -1058,6 +1058,8 @@
     case PIXEL_FORMAT_BGRA_8888:    return String8("BGRA_8888");
     case PIXEL_FORMAT_sRGB_A_8888:  return String8("sRGB_A_8888");
     case PIXEL_FORMAT_sRGB_X_8888:  return String8("sRGB_x_8888");
+    case HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED:
+                                    return String8("ImplDef");
     default:
         String8 result;
         result.appendFormat("? %08x", format);