| commit | f32476351a2b0497ba187268b09e64cbb0558bad | [log] [tgz] |
|---|---|---|
| author | Chuwei Xu <xucw@motorola.com> | Fri Oct 02 22:37:02 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 02 22:37:02 2020 +0000 |
| tree | 6930ede1da732185d729b3cb31672b596a63f706 | |
| parent | 660bccabe0f504539f96ef43aeea29c3f81a9010 [diff] | |
| parent | 8ab5cb317947849efac7d86c4dcb3c9a74fc8486 [diff] |
DO NOT MERGE Fix testVerifyStatsExternalConsistent case am: ffc805e106 am: 61c1261dfc am: 8ab5cb3179 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1196065 Change-Id: I7d2873e7a89829daf5538163e05997607cefeba6
diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp index 0782b43..ae77a99 100644 --- a/cmds/installd/InstalldNativeService.cpp +++ b/cmds/installd/InstalldNativeService.cpp
@@ -2195,6 +2195,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(); }