commit dd99c310c0594c0dfd7eeaa50bbe20b425044924
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 02 21:09:03 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 02 21:09:03 2020 +0000
tree 491747ca8a1b667c76ea82794d9f0988efaef127
parent a4e945595bdcdbf353a10222559c631f346bcfae
parent ffc805e1065369183c10ad2ea9e3ab2c2fe023a0

Merge "DO NOT MERGE Fix testVerifyStatsExternalConsistent case"

cmds/installd/InstalldNativeService.cpp

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