Merge "Implement shared-storage full backup/restore"

1 files changed, 2 insertions, 2 deletions

diff --git a/libs/utils/BackupHelpers.cpp b/libs/utils/BackupHelpers.cpp
index f933199fe8d1..b433fd3cf318 100644
--- a/libs/utils/BackupHelpers.cpp
+++ b/libs/utils/BackupHelpers.cpp
@@ -503,10 +503,10 @@ int write_tarfile(const String8& packageName, const String8& domain,
         needExtended = true;
     }
 
-    // Non-7bit-clean path also means needing pax extended format
+    // Non-7bit-clean path or embedded spaces also mean needing pax extended format
     if (!needExtended) {
         for (size_t i = 0; i < filepath.length(); i++) {
-            if ((filepath[i] & 0x80) != 0) {
+            if ((filepath[i] & 0x80) != 0 || filepath[i] == ' ') {
                 needExtended = true;
                 break;
             }