Merge "Revert Android.bp changes." am: 013fa056bb am: 4f2d030336 am: 8e025ea155 am: 1f4b4548bc

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1990472

Change-Id: I055077b0007680eb928d2886caf04fd7f2acaef0

1 files changed, 6 insertions, 2 deletions

diff --git a/cmds/installd/utils.cpp b/cmds/installd/utils.cpp
index 1afac576f9..3ce4b67d9a 100644
--- a/cmds/installd/utils.cpp
+++ b/cmds/installd/utils.cpp
@@ -674,8 +674,12 @@ static int rename_delete_dir_contents(const std::string& pathname,
     return delete_dir_contents(temp_dir_path.c_str(), 1, exclusion_predicate, ignore_if_missing);
 }
 
-bool is_renamed_deleted_dir(std::string_view path) {
-    return path.ends_with(deletedSuffix);
+bool is_renamed_deleted_dir(const std::string& path) {
+    if (path.size() < deletedSuffix.size()) {
+        return false;
+    }
+    std::string_view pathSuffix{path.c_str() + path.size() - deletedSuffix.size()};
+    return pathSuffix == deletedSuffix;
 }
 
 int rename_delete_dir_contents_and_dir(const std::string& pathname, bool ignore_if_missing) {