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

Commit 215df9c2 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Merge "Fix missing null checking" into oc-mr1-dev am: 93d436f4" into oc-mr1-dev-plus-aosp 

am: 2089f926

Change-Id: Id44a81a44df376ebcaa9efd229b78328d8eaa5ac
parents 96d66875 2089f926

core/java/android/app/LoadedApk.java

+3 −1
Original line number Diff line number Diff line
@@ -637,7 +637,9 @@ public final class LoadedApk { 
        // as unbundled.

        final String defaultSearchPaths = System.getProperty("java.library.path");

        final boolean treatVendorApkAsUnbundled = !defaultSearchPaths.contains("/vendor/lib");

        if (mApplicationInfo.getCodePath().startsWith("/vendor/") && treatVendorApkAsUnbundled) {

        if (mApplicationInfo.getCodePath() != null

                && mApplicationInfo.getCodePath().startsWith("/vendor/")

                && treatVendorApkAsUnbundled) {

            isBundledApp = false;

        }