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

Commit 8aefdab7 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Fix missing null checking" into oc-mr1-dev 

am: 93d436f4

Change-Id: Ib0a68cdf2d45141895191b7e2250ab0505c5a7ea
parents a210bf21 93d436f4

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;

        }