diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-16 22:49:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-05-16 22:49:42 +0000 |
| commit | 3e8d5f75b0901e74a5a0cec985f3eb1be7c96535 (patch) | |
| tree | 93ba798272704cd206b5d82dff6f5f9b0bd08727 | |
| parent | ef5404467a5cd3d9f7e1811dc303cf593e959da3 (diff) | |
| parent | 2cd83773e3109c7d07c438ba9a796c95caf67c3e (diff) | |
| download | native-3e8d5f75b0901e74a5a0cec985f3eb1be7c96535.tar.gz | |
Merge "Merge "Merge "Merge "Fix testVerifyStatsExternalConsistent case" into android10-tests-dev am: f9e600c112" into android11-tests-dev am: 6f05e37e28" into android12-tests-dev am: ea0da8adbc" into android12L-tests-dev
| -rw-r--r-- | cmds/installd/InstalldNativeService.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp index 95d9377a89..0f67035518 100644 --- a/cmds/installd/InstalldNativeService.cpp +++ b/cmds/installd/InstalldNativeService.cpp @@ -2220,6 +2220,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(); } |