commit cac8e13dc7712b3d1fa2a66f1942c3d62c82fa28
author TreeHugger Robot <treehugger-gerrit@google.com> Sun Feb 27 18:31:08 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sun Feb 27 18:31:08 2022 +0000
tree c6c4ae48347ae879731290353cc70825f81e6b2e
parent 41275405140949c448537625adfcc87d157cb673
parent 95db721b82cd3b6e5b0a6ef1d4efac28876ceb3b

Merge "Refactor doze suppressors into its own class" into tm-dev am: 95db721b82

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

Change-Id: I79e6dc22471fe36407550b0ada493eafd88a8a8f

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

diff --git a/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java b/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java
index 6dbe9b6..06405ae 100644
--- a/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java
+++ b/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java
@@ -30,6 +30,7 @@
 import static com.android.server.pm.PackageManagerService.SCAN_REQUIRE_KNOWN;
 import static com.android.server.pm.PackageManagerService.SYSTEM_PARTITIONS;
 import static com.android.server.pm.PackageManagerService.TAG;
+import static com.android.server.pm.pkg.parsing.ParsingPackageUtils.PARSE_FRAMEWORK_RES_SPLITS;
 
 import android.annotation.Nullable;
 import android.content.pm.parsing.ApkLiteParseUtils;
@@ -277,8 +278,9 @@
                     packageParser, executorService);
         }
 
-        scanDirTracedLI(frameworkDir, null,
-                mSystemParseFlags,
+        List<File> frameworkSplits = getFrameworkResApkSplitFiles();
+        scanDirTracedLI(frameworkDir, frameworkSplits,
+                mSystemParseFlags | PARSE_FRAMEWORK_RES_SPLITS,
                 mSystemScanFlags | SCAN_NO_DEX | SCAN_AS_PRIVILEGED, 0,
                 packageParser, executorService);
         if (!mPm.mPackages.containsKey("android")) {