commit 33483d4d6a0effce02332afefe17b5c4d49af0d3
author android-build-team Robot <android-build-team-robot@google.com> Thu Sep 21 21:52:21 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Sep 21 21:52:21 2017 +0000
tree 84169d8f9ababd03cbb417a24c6cc39be8025d90
parent f074989f62310a1f3d47fc6e6632314ce6865ca5
parent a416f721d911ce84c6a32f39ceb231f250edf4ef

release-request-a84b3435-75fa-41e8-bd3c-ca0f4cbd5cc5-for-git_oc-m2-release-4352002 snap-temp-L88700000105039240

Change-Id: I0c58cf89aa32cf6fd70dd9f84594993e6c30a9ce

EmulatedVolume.cpp

diff --git a/EmulatedVolume.cpp b/EmulatedVolume.cpp
index df91904..21b290a 100644
--- a/EmulatedVolume.cpp
+++ b/EmulatedVolume.cpp
@@ -84,6 +84,7 @@
                 "-g", "1023", // AID_MEDIA_RW
                 "-m",
                 "-w",
+                "-G",
                 mRawPath.c_str(),
                 label.c_str(),
                 NULL)) {

KeyUtil.cpp

diff --git a/KeyUtil.cpp b/KeyUtil.cpp
index 7bbbf01..dbc73c1 100644
--- a/KeyUtil.cpp
+++ b/KeyUtil.cpp
@@ -98,7 +98,7 @@
 static std::string keyname(const std::string& prefix, const std::string& raw_ref) {
     std::ostringstream o;
     o << prefix << ":";
-    for (auto i : raw_ref) {
+    for (unsigned char i : raw_ref) {
         o << std::hex << std::setw(2) << std::setfill('0') << (int)i;
     }
     return o.str();