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

Commit 637c52b8 authored by Hajime Morrita's avatar Hajime Morrita
Browse files

Remove pin_split_apks flag 

Now the toolchain side fix is in (b/174697187) and it's ready to
pin split APKs, so this doesn't have to be configurable.
(It was behind the flag in the case the other side of the fix
 doesn't happen before the OS release.)

Note that only pinnable app that with split APK so far
is Google Camera.

Bug: 174698005
Test: * Install GoogleCamera over PlayStore, then:
      * Run following command and inspect the output:
 $ adb shell device_config put runtime_native_boot pin_camera true
 $ adb shell cmd pinner repin && sleep 1 && adb shell dumpsys pinner
Change-Id: I20b4cf99aff6d55b813b48ed921bb9c25c06ae51
parent e46f19e2

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);

            }