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

Commit 758349ad authored by Hajime Morrita's avatar Hajime Morrita Committed by Automerger Merge Worker
Browse files

Merge "Remove pin_split_apks flag" into sc-dev am: 34385615 

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

Change-Id: I3ec309372f818656ad3ff061fb0a3c5a0b20eae7
parents ed22bb10 34385615

services/core/java/com/android/server/PinnerService.java

+1 −8
Original line number Diff line number Diff line
@@ -521,13 +521,6 @@ public final class PinnerService extends SystemService { 
        return pinKeys;

    }



    private static boolean shouldPinSplitApks() {

        // For now this is disabled by default bcause the pinlist support for split APKs are

        // missing in the toolchain. This flag should be removed once it is ready. b/174697187.

        return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_RUNTIME_NATIVE_BOOT,

                "pin_split_apks", false);

    }



    private synchronized ArraySet<Integer> getPinKeys() {

        return mPinKeys;

    }
@@ -685,7 +678,7 @@ public final class PinnerService extends SystemService { 
        List<String> apks = new ArrayList<>();

        apks.add(appInfo.sourceDir);



        if (shouldPinSplitApks() && appInfo.splitSourceDirs != null) {

        if (appInfo.splitSourceDirs != null) {

            for (String splitApk : appInfo.splitSourceDirs) {

                apks.add(splitApk);

            }