commit 2ffca8390f18195437fb27870e74c0bf52dc818d
author Roozbeh Pournader <roozbeh@google.com> Mon Mar 13 20:52:24 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 13 20:52:33 2017 +0000
tree c778389ca572777844066a98ff275d940949ad78
parent ebf3a0d57fb940d6a312181a615f9ff0d1d55862
parent 94a8acba754e70c463848f7f62414f6ad9e1dcdf

Merge "Check for existance of hyphenation pattern files first"

core/java/android/text/Hyphenator.java

diff --git a/core/java/android/text/Hyphenator.java b/core/java/android/text/Hyphenator.java
index c2508a6..ea1100e 100644
--- a/core/java/android/text/Hyphenator.java
+++ b/core/java/android/text/Hyphenator.java
@@ -135,6 +135,10 @@
     private static Hyphenator loadHyphenator(HyphenationData data) {
         String patternFilename = "hyph-" + data.mLanguageTag.toLowerCase(Locale.US) + ".hyb";
         File patternFile = new File(getSystemHyphenatorLocation(), patternFilename);
+        if (!patternFile.canRead()) {
+            Log.e(TAG, "hyphenation patterns for " + patternFile + " not found or unreadable");
+            return null;
+        }
         try {
             RandomAccessFile f = new RandomAccessFile(patternFile, "r");
             try {