commit ffc805e1065369183c10ad2ea9e3ab2c2fe023a0
author Chuwei Xu <xucw@motorola.com> Wed Dec 04 15:32:18 2019 +0800
committer Alex Medina <medina@google.com> Fri Oct 02 20:08:53 2020 +0000
tree 08624e6758e7e3f6e9a85f99131cd299052e7d16
parent aa0f5b0025ccecd91929febc5e3d5fb6c240ecdf

DO NOT MERGE Fix testVerifyStatsExternalConsistent case

Root cause: For devices mount /data partition without quota option will
get this testcase failure, because
the getExternalSize logic will use Android/obb path
to calculate totalsize.
But the testcase will check the totalsize excluding obb.

Solution： For device mounted userdata without quota option
will remove obbSize from totalSize, to
Make android.appsecurity.cts.StorageHostTest
testcase PASS.

Test:  run cts-on-gsi -m CtsAppSecurityHostTestCases -t
android.appsecurity.cts.StorageHostTest

Bug: 145269983
Change-Id: I8df02d5427d7512046ca3793f03a133a4ad00cbd
(cherry picked from 5d64ddfe8907ecc016849414fce7ea364a3bdd26)

cmds/installd/InstalldNativeService.cpp

diff --git a/cmds/installd/InstalldNativeService.cpp b/cmds/installd/InstalldNativeService.cpp
index 737c6c9..b5208f8 100644
--- a/cmds/installd/InstalldNativeService.cpp
+++ b/cmds/installd/InstalldNativeService.cpp
@@ -2016,6 +2016,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();
     }