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

Commit e1e02641 authored by Kiyoung Kim's avatar Kiyoung Kim Committed by android-build-merger
Browse files

Merge "Mark product apks as unbundled" am: 856ef556 

am: 716111d8

Change-Id: I242bbc9c151a4a8751d852fed34ec021675aad1b
parents 3176d573 716111d8

core/java/android/app/LoadedApk.java

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