From 63495c2796ff6857233f1906c91d7967852e39ca Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 15 Sep 2017 07:48:06 +0900 Subject: Fix missing null checking Bug: 65666724 Test: build Change-Id: Ie3fa891da012cbb3f313a33e0e5759f743887480 --- core/java/android/app/LoadedApk.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java index 0f9a3d71313a..f6d9710dae69 100644 --- 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; } -- cgit v1.2.3-59-g8ed1b