summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2019-12-21 15:33:32 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-12-21 15:33:32 +0000
commitf9e600c112fed39d09d62ec558a474621219efd5 (patch)
tree2adc52a4a59db6e888700cdefbf3bda5c0e45e3e
parent7eca3198fda97a83956a9c166c22289a6fa7b199 (diff)
parent5d64ddfe8907ecc016849414fce7ea364a3bdd26 (diff)
downloadnative-f9e600c112fed39d09d62ec558a474621219efd5.tar.gz
Merge "Fix testVerifyStatsExternalConsistent case" into android10-tests-dev
-rw-r--r--cmds/installd/InstalldNativeService.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index caac2e89a7..695426a0a5 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -1996,6 +1996,9 @@ binder::Status InstalldNativeService::getExternalSize(const std::unique_ptr<std:
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();
}