Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable updatable system manifest for T" into tm-dev

Browse Source
This commit is contained in:
Pedro Loureiro
2022-02-24 12:06:26 +00:00
committed by Android (Google) Code Review
parent 87463e8e02 591cfa680c
commit 4b9437eb95
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java
View File

@@ -30,7 +30,6 @@ import static com.android.server.pm.PackageManagerService.SCAN_NO_DEX;
import static com.android.server.pm.PackageManagerService.SCAN_REQUIRE_KNOWN; 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.SYSTEM_PARTITIONS;
import static com.android.server.pm.PackageManagerService.TAG; 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.annotation.Nullable;
import android.content.pm.parsing.ApkLiteParseUtils; import android.content.pm.parsing.ApkLiteParseUtils;
@@ -278,9 +277,8 @@ final class InitAndSystemPackageHelper {
packageParser, executorService); packageParser, executorService);
} }
List<File> frameworkSplits = getFrameworkResApkSplitFiles(); scanDirTracedLI(frameworkDir, null,
scanDirTracedLI(frameworkDir, frameworkSplits, mSystemParseFlags,
mSystemParseFlags | PARSE_FRAMEWORK_RES_SPLITS,
mSystemScanFlags | SCAN_NO_DEX | SCAN_AS_PRIVILEGED, 0, mSystemScanFlags | SCAN_NO_DEX | SCAN_AS_PRIVILEGED, 0,
packageParser, executorService); packageParser, executorService);
if (!mPm.mPackages.containsKey("android")) { if (!mPm.mPackages.containsKey("android")) {