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

Commit 68c88982 authored by Dan Zivkovic's avatar Dan Zivkovic
Browse files

Handle missing resources. 

Needed for unit tests related to various bug fixes.

Bug 19930761.

Change-Id: I776ccccb032e3d1b181b02c6bb768500790870f7
parent 8f526c9a

java/src/com/android/inputmethod/latin/BinaryDictionaryGetter.java

+9 −5
Original line number Diff line number Diff line
@@ -91,10 +91,15 @@ final public class BinaryDictionaryGetter { 
     */

    public static AssetFileAddress loadFallbackResource(final Context context,

            final int fallbackResId) {

        final AssetFileDescriptor afd = context.getResources().openRawResourceFd(fallbackResId);

        AssetFileDescriptor afd = null;

        try {

            afd = context.getResources().openRawResourceFd(fallbackResId);

        } catch (RuntimeException e) {

            Log.e(TAG, "Resource not found: " + fallbackResId, e);

            return null;

        }

        if (afd == null) {

            Log.e(TAG, "Found the resource but cannot read it. Is it compressed? resId="

                    + fallbackResId);

            Log.e(TAG, "Resource cannot be opened: " + fallbackResId);

            return null;

        }

        try {
@@ -103,8 +108,7 @@ final public class BinaryDictionaryGetter { 
        } finally {

            try {

                afd.close();

            } catch (IOException e) {

                // Ignored

            } catch (IOException ignored) {

            }

        }

    }