From 637c52b861d36f022350d252c5c214dbb07e81b9 Mon Sep 17 00:00:00 2001 From: Hajime Morrita Date: Mon, 15 Mar 2021 12:48:57 -0700 Subject: [PATCH] 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 --- services/core/java/com/android/server/PinnerService.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/services/core/java/com/android/server/PinnerService.java b/services/core/java/com/android/server/PinnerService.java index 871de0dc28bf8..ebd32e8479cea 100644 --- a/services/core/java/com/android/server/PinnerService.java +++ b/services/core/java/com/android/server/PinnerService.java @@ -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 getPinKeys() { return mPinKeys; } @@ -685,7 +678,7 @@ public final class PinnerService extends SystemService { List apks = new ArrayList<>(); apks.add(appInfo.sourceDir); - if (shouldPinSplitApks() && appInfo.splitSourceDirs != null) { + if (appInfo.splitSourceDirs != null) { for (String splitApk : appInfo.splitSourceDirs) { apks.add(splitApk); }