commit 3e771cf1597d6066ad0fdf83a746c33d32fa5e60
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Oct 18 20:10:54 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 18 20:10:54 2021 +0000
tree 2c28e7c4f7b242ca1c894f4db8d717a70db5a9cf
parent 2e1a9d88a58fac889f13b18a9e6c181a8459feab
parent d4a4e538413eb3ddd2f4f8625d0d111310e3c4dd

Merge "Snap for 7834066 from fd2a942a07401b0a0fa5f3d73841026da2348220 to android12-tests-release" into android12-tests-release

cmds/installd/InstalldNativeService.cpp

diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index 74be7ce..0727b88 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -2207,6 +2207,9 @@
         auto obbPath = StringPrintf("%s/Android/obb",
                 create_data_media_path(uuid_, userId).c_str());
         calculate_tree_size(obbPath, &obbSize);
+        if (!(flags & FLAG_USE_QUOTA)) {
+            totalSize -= obbSize;
+        }
         ATRACE_END();
     }