commit 9a0e2939f37b19018dfaa118873f400157fd74ec
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Oct 09 10:53:57 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Oct 09 10:53:57 2021 +0000
tree 2c28e7c4f7b242ca1c894f4db8d717a70db5a9cf
parent f2dfe9ac5a9d757184ec690abea3f6304953cf79
parent 6f05e37e28db5ec9e313002badfe5a380f439c47

Merge "Merge "Fix testVerifyStatsExternalConsistent case" into android10-tests-dev am: f9e600c112" into android11-tests-dev am: 6f05e37e28

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1179609

Change-Id: Idf22374a3ecda95c9570ce260b86b704acfd79d7

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();
     }