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

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

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

Change-Id: I3ec309372f818656ad3ff061fb0a3c5a0b20eae7
This commit is contained in:
Hajime Morrita
2021-03-18 23:48:56 +00:00
committed by Automerger Merge Worker
parent ed22bb1049 34385615dd
commit 758349ad75
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/PinnerService.java
View File

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