Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc10a04f authored by Martijn Coenen's avatar Martijn Coenen Committed by android-build-merger
Browse files

Merge "Don't remove OBBs when clearing app data." 

am: 105e189e

Change-Id: I831abb95671588a17e4c69b506df955280e573c9
parents e4388a6f 105e189e

cmds/installd/InstalldNativeService.cpp

+2 −4
Original line number Original line Diff line number Diff line
@@ -626,10 +626,8 @@ binder::Status InstalldNativeService::clearAppData(const std::unique_ptr<std::st 
                if (delete_dir_contents(path, true) != 0) {

                if (delete_dir_contents(path, true) != 0) {

                    res = error("Failed to delete contents of " + path);

                    res = error("Failed to delete contents of " + path);

                }

                }

                path = StringPrintf("%s/Android/obb/%s", extPath.c_str(), pkgname);

                // Note that we explicitly don't delete OBBs - those are only removed on

                if (delete_dir_contents(path, true) != 0) {

                // app uninstall.

                    res = error("Failed to delete contents of " + path);

                }

            }

            }

        }

        }

    }

    }