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

Commit be955e81 authored by Kiyoung Kim's avatar Kiyoung Kim
Browse files

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
parent 20d03953

core/java/android/app/LoadedApk.java

+0 −10
Original line number Diff line number Diff line
@@ -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;