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

Commit 591cfa68 authored by Pedro Loureiro's avatar Pedro Loureiro
Browse files

Disable updatable system manifest for T 

Bug: 195732042

Merged-In: I6b890e5536c17dd53722e2c3a781c85dd9d6bdf0
Note: the merged-in id is not related with this change but is something
that was already merged in internal master and we don't want this change
to be merged there.

Test: pre-submit + check auto-merger comment in the CL

Change-Id: Idcff9b310ee3e7238e7fd4982d083d496fda9d9e
parent 329d5a13

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

+2 −4
Original line number Diff line number Diff line
@@ -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.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;
@@ -278,9 +277,8 @@ final class InitAndSystemPackageHelper { 
                    packageParser, executorService);

        }



        List<File> frameworkSplits = getFrameworkResApkSplitFiles();

        scanDirTracedLI(frameworkDir, frameworkSplits,

                mSystemParseFlags | PARSE_FRAMEWORK_RES_SPLITS,

        scanDirTracedLI(frameworkDir, null,

                mSystemParseFlags,

                mSystemScanFlags | SCAN_NO_DEX | SCAN_AS_PRIVILEGED, 0,

                packageParser, executorService);

        if (!mPm.mPackages.containsKey("android")) {