commit e402b5fc5c7246b4f5c346cb2e5adeeb3350243a
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 31 17:35:33 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 31 17:35:33 2017 +0000
tree 450b103766707432c4703e3e65c4c2713750b554
parent 27c5ac029619efe630a258aae92e2c496733c677
parent eedb69abbde29ad3dd624f1f9dfc72e4f35d5234

Merge "Add ColorSpace::createLUT"

cmds/installd/dexopt.cpp

diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index 66d941d..618884b 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -498,7 +498,7 @@
     fd_t profile_fd = -1;
     std::string profile_file = create_primary_profile(profile_dir);
 
-    profile_fd = TEMP_FAILURE_RETRY(open(profile_file.c_str(), open_mode | O_NOFOLLOW));
+    profile_fd = TEMP_FAILURE_RETRY(open(profile_file.c_str(), open_mode | O_NOFOLLOW, 0600));
     if (profile_fd == -1) {
         // It's not an error if the profile file does not exist.
         if (errno != ENOENT) {
@@ -757,7 +757,7 @@
         return false;
     }
 
-    fd_t output_fd = open(out_file_name.c_str(), O_WRONLY | O_CREAT | O_TRUNC | O_NOFOLLOW);
+    fd_t output_fd = open(out_file_name.c_str(), O_WRONLY | O_CREAT | O_TRUNC | O_NOFOLLOW, 0644);
     if (fchmod(output_fd, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) < 0) {
         ALOGE("installd cannot chmod '%s' dump_profile\n", out_file_name.c_str());
         return false;

include/binder/IpPrefix.h

diff --git a/include/binder/IpPrefix.h b/include/binder/IpPrefix.h
index f8c80dc..96ebaac 100644
--- a/include/binder/IpPrefix.h
+++ b/include/binder/IpPrefix.h
@@ -71,6 +71,7 @@
 
 private:
     union InternalUnion {
+        InternalUnion() = default;
         InternalUnion(const struct in6_addr &addr):mIn6Addr(addr) { };
         InternalUnion(const struct in_addr &addr):mInAddr(addr) { };
         struct in6_addr mIn6Addr;

vulkan/api/vulkan.api

diff --git a/vulkan/api/vulkan.api b/vulkan/api/vulkan.api
index 467ae7a..5a67d36 100644
--- a/vulkan/api/vulkan.api
+++ b/vulkan/api/vulkan.api
@@ -223,6 +223,9 @@
 
     //@extension("VK_KHR_swapchain")
     VK_IMAGE_LAYOUT_PRESENT_SRC_KHR                         = 1000001002,
+
+    //@extension("VK_KHR_shared_presentable_image")
+    VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR                      = 1000111000,
 }
 
 enum VkAttachmentLoadOp {

vulkan/include/vulkan/vulkan.h

diff --git a/vulkan/include/vulkan/vulkan.h b/vulkan/include/vulkan/vulkan.h
index 26356f3..8d24aa7 100644
--- a/vulkan/include/vulkan/vulkan.h
+++ b/vulkan/include/vulkan/vulkan.h
@@ -530,6 +530,7 @@
     VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL = 7,
     VK_IMAGE_LAYOUT_PREINITIALIZED = 8,
     VK_IMAGE_LAYOUT_PRESENT_SRC_KHR = 1000001002,
+    VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR = 1000111000,
     VK_IMAGE_LAYOUT_BEGIN_RANGE = VK_IMAGE_LAYOUT_UNDEFINED,
     VK_IMAGE_LAYOUT_END_RANGE = VK_IMAGE_LAYOUT_PREINITIALIZED,
     VK_IMAGE_LAYOUT_RANGE_SIZE = (VK_IMAGE_LAYOUT_PREINITIALIZED - VK_IMAGE_LAYOUT_UNDEFINED + 1),