diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-09 10:53:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-09 10:53:57 +0000 |
| commit | 9a0e2939f37b19018dfaa118873f400157fd74ec (patch) | |
| tree | 2c28e7c4f7b242ca1c894f4db8d717a70db5a9cf | |
| parent | f2dfe9ac5a9d757184ec690abea3f6304953cf79 (diff) | |
| parent | 6f05e37e28db5ec9e313002badfe5a380f439c47 (diff) | |
| download | native-9a0e2939f37b19018dfaa118873f400157fd74ec.tar.gz | |
Merge "Merge "Fix testVerifyStatsExternalConsistent case" into android10-tests-dev am: f9e600c112" into android11-tests-dev am: 6f05e37e28
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1179609
Change-Id: Idf22374a3ecda95c9570ce260b86b704acfd79d7
| -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 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(); } |