From 32a5b9aed304e6619248cb58727e8b29d61d3b1c Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Wed, 20 Dec 2017 12:38:47 -0800
Subject: [PATCH] StartsWith now allows std::string prefixes.

Bug: N/A
Test: builds
Change-Id: I2e24632e95f2bf929c2c000152c5c4076d53186e
---
 Process.cpp       | 4 ++--
 VolumeManager.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Process.cpp b/Process.cpp
index 042ba2d..9038af2 100644
--- a/Process.cpp
+++ b/Process.cpp
@@ -52,7 +52,7 @@ static bool checkMaps(const std::string& path, const std::string& prefix) {
         std::string::size_type pos = line.find('/');
         if (pos != std::string::npos) {
             line = line.substr(pos);
-            if (android::base::StartsWith(line, prefix.c_str())) {
+            if (android::base::StartsWith(line, prefix)) {
                 LOG(WARNING) << "Found map " << path << " referencing " << line;
                 found = true;
             }
@@ -64,7 +64,7 @@ static bool checkMaps(const std::string& path, const std::string& prefix) {
 static bool checkSymlink(const std::string& path, const std::string& prefix) {
     std::string res;
     if (android::base::Readlink(path, &res)) {
-        if (android::base::StartsWith(res, prefix.c_str())) {
+        if (android::base::StartsWith(res, prefix)) {
             LOG(WARNING) << "Found symlink " << path << " referencing " << res;
             return true;
         }
diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 0936ed0..5e6e74f 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -426,7 +426,7 @@ static int unmount_tree(const std::string& prefix) {
     mntent* mentry;
     while ((mentry = getmntent(fp)) != NULL) {
         auto test = std::string(mentry->mnt_dir) + "/";
-        if (android::base::StartsWith(test, prefix.c_str())) {
+        if (android::base::StartsWith(test, prefix)) {
             toUnmount.push_front(test);
         }
     }