Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE when adding WebView to ResourcesManager" into oc-dev

Browse Source 
am: 7e5205137c

Change-Id: Ifb45086ba1c53e4de5abe83de66118e026c3c297
This commit is contained in:
Adam Lesinski
2017-04-05 20:49:06 +00:00
committed by android-build-merger
parent 6011f7c74d 7e5205137c
commit 9f887687fd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/ResourcesManager.java
View File

@@ -945,7 +945,7 @@ public class ResourcesManager {
final ResourcesKey key = mResourceImpls.keyAt(i);
final WeakReference<ResourcesImpl> weakImplRef = mResourceImpls.valueAt(i);
final ResourcesImpl impl = weakImplRef != null ? weakImplRef.get() : null;
if (impl != null && key.mResDir.equals(assetPath)) {
if (impl != null && Objects.equals(key.mResDir, assetPath)) {
if (!ArrayUtils.contains(key.mLibDirs, libAsset)) {
final int newLibAssetCount = 1 +
(key.mLibDirs != null ? key.mLibDirs.length : 0);