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

Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev am: 1362ae0

Browse Source 
am: 40c6118

* commit '40c611853eedd9d7ebf41a778e278751fbc82cb8':
  ResourcesManager: Throw exception if failed to load asset path

Change-Id: I609d2b2a22ecb274c21a413edabd7ac4b28fbc94
This commit is contained in:
Adam Lesinski
2016-04-20 23:00:21 +00:00
committed by android-build-merger
parent 78bdfbba43 40c611853e
commit fc2de302f4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,7 +224,7 @@ public class ResourcesManager {
* @return a new AssetManager. * @return a new AssetManager.
*/ */
@VisibleForTesting @VisibleForTesting
protected AssetManager createAssetManager(@NonNull final ResourcesKey key) { protected @NonNull AssetManager createAssetManager(@NonNull final ResourcesKey key) {
AssetManager assets = new AssetManager(); AssetManager assets = new AssetManager();
// resDir can be null if the 'android' package is creating a new Resources object. // resDir can be null if the 'android' package is creating a new Resources object.
@@ -232,14 +232,15 @@ public class ResourcesManager {
// already. // already.
if (key.mResDir != null) { if (key.mResDir != null) {
if (assets.addAssetPath(key.mResDir) == 0) { if (assets.addAssetPath(key.mResDir) == 0) {
return null; throw new IllegalArgumentException("failed to add asset path " + key.mResDir);
} }
} }
if (key.mSplitResDirs != null) { if (key.mSplitResDirs != null) {
for (final String splitResDir : key.mSplitResDirs) { for (final String splitResDir : key.mSplitResDirs) {
if (assets.addAssetPath(splitResDir) == 0) { if (assets.addAssetPath(splitResDir) == 0) {
return null; throw new IllegalArgumentException(
"failed to add split asset path " + splitResDir);
} }
} }
} }