Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89cc942a authored by Jiakai Zhang's avatar Jiakai Zhang Committed by Automerger Merge Worker
Browse files

Merge "Calculate apk size multiple times" am: 223579af 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2372568



Change-Id: I0cd3b05fb3321274c2944fd25ee1cefee1cdfaba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b2422290 223579af

services/core/java/com/android/server/pm/BackgroundDexOptService.java

+7 −4
Original line number Diff line number Diff line
@@ -572,11 +572,14 @@ public final class BackgroundDexOptService { 
            size += getDirectorySize(path);

            if (!ArrayUtils.isEmpty(info.applicationInfo.splitSourceDirs)) {

                for (String splitSourceDir : info.applicationInfo.splitSourceDirs) {

                    path = Paths.get(splitSourceDir).toFile();

                    if (path.isFile()) {

                        path = path.getParentFile();

                    File pathSplitSourceDir = Paths.get(splitSourceDir).toFile();

                    if (pathSplitSourceDir.isFile()) {

                        pathSplitSourceDir = pathSplitSourceDir.getParentFile();

                    }

                    size += getDirectorySize(path);

                    if (path.getAbsolutePath().equals(pathSplitSourceDir.getAbsolutePath())) {

                        continue;

                    }

                    size += getDirectorySize(pathSplitSourceDir);

                }

            }

            return size;