| commit | 2cd83773e3109c7d07c438ba9a796c95caf67c3e | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 16 22:49:39 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 16 22:49:39 2022 +0000 |
| tree | 93ba798272704cd206b5d82dff6f5f9b0bd08727 | |
| parent | ef5404467a5cd3d9f7e1811dc303cf593e959da3 [diff] | |
| parent | ea0da8adbcd60e34030fd069587039e225fdda20 [diff] |
Merge "Merge "Merge "Fix testVerifyStatsExternalConsistent case" into android10-tests-dev am: f9e600c112" into android11-tests-dev am: 6f05e37e28" into android12-tests-dev am: ea0da8adbc Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1179609 Change-Id: Ifaac42c52595808a173f058e385c5aeb530bc98e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp index 95d9377..0f67035 100644 --- a/cmds/installd/InstalldNativeService.cpp +++ b/cmds/installd/InstalldNativeService.cpp
@@ -2220,6 +2220,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(); }