commit 47b9deba5bfdc135727232f52c1d192b6a2d611a
author Jeff Sharkey <jsharkey@android.com> Thu Apr 30 17:34:00 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 30 17:34:00 2015 +0000
tree 11f2cfcb8fc3cbcda9dfe252306c2a9024ed52e2
parent 783d40a60427199ad88e3049266f24d91f7db282
parent 74e6349d8e4dde988c121e9674472908cc8c748d

am 74e6349d: Merge "Fix signed issue with hex conversion." into mnc-dev

* commit '74e6349d8e4dde988c121e9674472908cc8c748d':
  Fix signed issue with hex conversion.

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index 158a61e..f45907a 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -381,7 +381,7 @@
 status_t StrToHex(const std::string& str, std::string& hex) {
     hex.clear();
     for (size_t i = 0; i < str.size(); i++) {
-        hex.push_back(kLookup[str[i] >> 4]);
+        hex.push_back(kLookup[(str[i] & 0xF0) >> 4]);
         hex.push_back(kLookup[str[i] & 0x0F]);
     }
     return OK;