diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-09-15 02:49:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-09-15 02:49:26 +0000 |
| commit | 2089f926254ee91068141cf77ea6d49b0f99308b (patch) | |
| tree | cec8e636914cd7278e2a23fb2fad188bf3042274 /core/java | |
| parent | 609495e2981cab0acb16ce94ed1c44fdbc7c4caa (diff) | |
| parent | 8aefdab7c3aeb7b40971cdcd84593512b795877e (diff) | |
Merge "Merge "Fix missing null checking" into oc-mr1-dev am: 93d436f4bc" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/LoadedApk.java | 4 |
1 files changed, 3 insertions, 1 deletions
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; } |