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

Commit 2089f926 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

parents 609495e2 8aefdab7

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;

        }