commit 7be9fbd05cbe811f42b4b2ecbda4b2bbd61ce485
author android-build-prod (mdb) <android-build-team-robot@google.com> Tue Oct 20 20:08:28 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 20 20:08:28 2020 +0000
tree 288404aa28ecb1b4ae6ff631f5994a1e41d54d33
parent df8a0739f7ab42ce59e2370867d26ed2793b6228
parent b240f32a8ce3b054f8a3c4fee9825f7bb194eec2

Merge "Snap for 6918432 from 2c487876a828824481c4856816a6b9e47894547c to android11-tests-release" into android11-tests-release

cmds/installd/InstalldNativeService.cpp

diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index b9c1add..c1f67b2 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -2194,6 +2194,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();
     }