Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 604a0a9f authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

Merge "ResourcesManager: Throw exception if failed to load asset path" into... 

Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev am: 1362ae06 am: 40c61185
am: fc2de302

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

Change-Id: I9fb7f2df3d37cb4ba6cb8fa9e3fc10a7999c6e36
parents 24ebda4a fc2de302

core/java/android/app/ResourcesManager.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -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);

                }

                }

            }

            }

        }

        }