merge in master-release history after reset to b9e879d429945cebc12a52e1ceaf0846eea564f1
diff --git a/data/etc/android.software.webview.xml b/data/etc/android.software.webview.xml
new file mode 100644
index 0000000..d843209
--- /dev/null
+++ b/data/etc/android.software.webview.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<permissions>
+ <feature name="android.software.webview" />
+</permissions>
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 }
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);