summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-10-18 20:10:54 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-10-18 20:10:54 +0000
commit3e771cf1597d6066ad0fdf83a746c33d32fa5e60 (patch)
tree2c28e7c4f7b242ca1c894f4db8d717a70db5a9cf
parent2e1a9d88a58fac889f13b18a9e6c181a8459feab (diff)
parentd4a4e538413eb3ddd2f4f8625d0d111310e3c4dd (diff)
downloadnative-android-vts-12.0_r2.tar.gz
Merge "Snap for 7834066 from fd2a942a07401b0a0fa5f3d73841026da2348220 to android12-tests-release" into android12-tests-releaseandroid-vts-12.0_r3android-vts-12.0_r2android-cts-12.0_r3android-cts-12.0_r2
-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 74be7cedc7..0727b88d63 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -2207,6 +2207,9 @@ binder::Status InstalldNativeService::getExternalSize(const std::optional<std::s
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();
}