Upstream Android Changes from K release

R=scroggo@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/145233002

git-svn-id: http://skia.googlecode.com/svn/trunk@13152 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/src/ports/SkFontConfigInterface_android.cpp b/src/ports/SkFontConfigInterface_android.cpp
index c2ea87e..14be934 100644 (file)
--- a/src/ports/SkFontConfigInterface_android.cpp
+++ b/src/ports/SkFontConfigInterface_android.cpp
@@ -633,7 +633,7 @@ SkTypeface* SkFontConfigInterfaceAndroid::nextLogicalTypeface(SkFontID currFontI
     const SkTypeface* currTypeface = SkTypefaceCache::FindByID(currFontID);
     // non-system fonts are not in the font cache so if we are asked to fallback
     // for a non-system font we will start at the front of the chain.
-    if (NULL != currTypeface && currFontID != origFontID) {
+    if (NULL != currTypeface) {
         currFontRecID = ((FontConfigTypeface*)currTypeface)->getIdentity().fID;
         SkASSERT(INVALID_FONT_REC_ID != currFontRecID);
     }