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

2017-09-15 02:49:26 +00:00
parent 609495e298 8aefdab7c3
commit 2089f92625
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/app/LoadedApk.java
+++ b/core/java/android/app/LoadedApk.java
@@ -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;
        }