Merge "Don't remove OBBs when clearing app data." am: 105e189e41 am: cc10a04f87 am: d7ff7ddb1a

Change-Id: I36f57cecb681f8423cf94312720d3eb0536d0c0b

1 files changed, 2 insertions, 4 deletions

diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index f8a68b4038..6b14beefd0 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -639,10 +639,8 @@ binder::Status InstalldNativeService::clearAppData(const std::unique_ptr<std::st
                 if (delete_dir_contents(path, true) != 0) {
                     res = error("Failed to delete contents of " + path);
                 }
-                path = StringPrintf("%s/Android/obb/%s", extPath.c_str(), pkgname);
-                if (delete_dir_contents(path, true) != 0) {
-                    res = error("Failed to delete contents of " + path);
-                }
+                // Note that we explicitly don't delete OBBs - those are only removed on
+                // app uninstall.
             }
         }
     }