From 24a93078271261e632b3b28fab8d41c1386b2fde Mon Sep 17 00:00:00 2001
From: Martijn Coenen <maco@google.com>
Date: Wed, 8 Jan 2020 10:10:43 +0100
Subject: Don't remove OBBs when clearing app data.

This was a regression in Q - OBBs should only be removed when
uninstalling the app, not when clearing app data.

Bug: 138290079
Test: install OBB game, clear data, verify OBB still present
Change-Id: Ib9e802b976acb8ad2b9e95b7b685848180743203
---
 cmds/installd/InstalldNativeService.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'cmds/installd/InstalldNativeService.cpp')

diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index 737c6c9582..adc2404e6f 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -626,10 +626,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.
             }
         }
     }
-- 
cgit v1.2.3-59-g8ed1b