diff options
| author | Seigo Nonaka <nona@google.com> | 2017-10-16 23:21:50 -0700 |
|---|---|---|
| committer | Seigo Nonaka <nona@google.com> | 2017-10-16 23:21:50 -0700 |
| commit | 0503f8882446a52f11357811dae74bd2c70db5bf (patch) | |
| tree | 0b613e604a039df864cff7f192ebf25867b56771 /libs/minikin/HyphenatorMap.cpp | |
| parent | b76fd0c864c1fc06eb25f214851b5f40e9c6a321 (diff) | |
| download | minikin-0503f8882446a52f11357811dae74bd2c70db5bf.tar.gz | |
Relax the assertion with error message.
Looks like emulator don't have hyphenator pattern files.
Bug: 67876879
Test: N/A
Change-Id: I2ac0f07b19a8a01012846d448d64836b46dac9a8
Diffstat (limited to 'libs/minikin/HyphenatorMap.cpp')
| -rw-r--r-- | libs/minikin/HyphenatorMap.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/minikin/HyphenatorMap.cpp b/libs/minikin/HyphenatorMap.cpp index ae77004..c38feec 100644 --- a/libs/minikin/HyphenatorMap.cpp +++ b/libs/minikin/HyphenatorMap.cpp @@ -66,7 +66,10 @@ void HyphenatorMap::addAliasInternal( const FontLanguage toLocale(toLocaleStr); android::AutoMutex _l(gMinikinLock); auto it = mMap.find(toLocale.getIdentifier()); - MINIKIN_ASSERT(it != mMap.end(), "Target Hyphenator not found."); + if (it == mMap.end()) { + ALOGE("Target Hyphenator not found."); + return; + } addInternalLocked(fromLocale, it->second); } |