commit | 531e6e13a424c6772139226352f1fc40003623e9 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Oct 20 15:38:04 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Oct 20 15:38:04 2020 +0000 |
tree | 288404aa28ecb1b4ae6ff631f5994a1e41d54d33 | |
parent | 40b131e0271985c4e818b2b616d896382b4249c0 [diff] | |
parent | f9e600c112fed39d09d62ec558a474621219efd5 [diff] |
Merge "Fix testVerifyStatsExternalConsistent case" into android10-tests-dev am: f9e600c112 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1179609 Change-Id: Id19160801137a718d337050e9ab4a219008dc90b
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(); }