commit 27c5ac029619efe630a258aae92e2c496733c677
author Chris Forbes <chrisforbes@google.com> Tue Jan 31 04:51:19 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 31 04:51:20 2017 +0000
tree 68f015c93d828ef52be0b7f9add0cc4a966e68cd
parent 28ac876ba6c4a88ac2d5614e93fb7d27ac205cde
parent af3a1117ffa206a6e3143edf32c494b64e39f303

Merge "vulkan: Add missing IMAGE_LAYOUT_SHARED_PRESENT_KHR enum"

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;