commit e283f998c6dd4b3bc8f281951f286fbe46642aa6
author TreeHugger Robot <treehugger-gerrit@google.com> Sun Feb 25 02:45:33 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun Feb 25 02:45:33 2018 +0000
tree bfba9ef40cbd648af54069f6a4bbfcf33fcb5f2b
parent e50314d52b818f74d0f46b87ff6aebc74d037164
parent 5540b4406c2ca9c5a3654cabc1ab7e88afde58b5

Merge "Use unique_ptr<DIR> to safely release resources."

model/Disk.cpp

diff --git a/model/Disk.cpp b/model/Disk.cpp
index 9fcf5e1..d7b19ac 100644
--- a/model/Disk.cpp
+++ b/model/Disk.cpp
@@ -257,6 +257,7 @@
             PLOG(WARNING) << "Failed to read vendor from " << path;
             return -errno;
         }
+        tmp = android::base::Trim(tmp);
         mLabel = tmp;
         break;
     }
@@ -267,6 +268,7 @@
             PLOG(WARNING) << "Failed to read manufacturer from " << path;
             return -errno;
         }
+        tmp = android::base::Trim(tmp);
         int64_t manfid;
         if (!android::base::ParseInt(tmp, &manfid)) {
             PLOG(WARNING) << "Failed to parse manufacturer " << tmp;