diff options
author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-10-20 20:08:28 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-10-20 20:08:28 +0000 |
commit | 7be9fbd05cbe811f42b4b2ecbda4b2bbd61ce485 (patch) | |
tree | 288404aa28ecb1b4ae6ff631f5994a1e41d54d33 | |
parent | df8a0739f7ab42ce59e2370867d26ed2793b6228 (diff) | |
parent | b240f32a8ce3b054f8a3c4fee9825f7bb194eec2 (diff) | |
download | native-7be9fbd05cbe811f42b4b2ecbda4b2bbd61ce485.tar.gz |
Merge "Snap for 6918432 from 2c487876a828824481c4856816a6b9e47894547c to android11-tests-release" into android11-tests-releaseandroid-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android11-tests-release
-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 b9c1addf89..c1f67b246b 100644 --- a/cmds/installd/InstalldNativeService.cpp +++ b/cmds/installd/InstalldNativeService.cpp @@ -2194,6 +2194,9 @@ binder::Status InstalldNativeService::getExternalSize(const std::unique_ptr<std: 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(); } |