From be955e81b19878902dfa61bcb2e457401a7aab24 Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Fri, 12 Apr 2019 10:52:43 +0900 Subject: [PATCH] DO NOT MERGE Do not check product unbundled from Q This code should be enabled from R, but for some devices it just works because of target SDK + no /product/lib directory. To avoid confusion this code should be removed from Q release Bug: 129011845 Test: m -j Change-Id: I4d85cbcb5e2cbe694ec065f4e3d060eb74f542ba --- core/java/android/app/LoadedApk.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java index e16ce24cbb2cb..310cce41fa41f 100644 --- a/core/java/android/app/LoadedApk.java +++ b/core/java/android/app/LoadedApk.java @@ -781,16 +781,6 @@ public final class LoadedApk { isBundledApp = false; } - // Similar to vendor apks, we should add /product/lib for apks from product partition - // and not having /product/lib in the default search path - final boolean treatProductApkAsUnbundled = !defaultSearchPaths.contains("/product/lib"); - if (mApplicationInfo.getCodePath() != null - && mApplicationInfo.isProduct() && treatProductApkAsUnbundled - // TODO(b/128557860): Change target SDK version when version code R is available. - && getTargetSdkVersion() == Build.VERSION_CODES.CUR_DEVELOPMENT) { - isBundledApp = false; - } - makePaths(mActivityThread, isBundledApp, mApplicationInfo, zipPaths, libPaths); String libraryPermittedPath = mDataDir;