Update Android's FontHost to return NULL if familyName does not match

src/ports/SkFontConfigInterface_android.cpp

Index: src/ports/SkFontConfigInterface_android.cpp
diff --git a/src/ports/SkFontConfigInterface_android.cpp b/src/ports/SkFontConfigInterface_android.cpp
index 9a38261e80262789788e545dd9d86cbb5d1d9825..c698d0c3c6cb5d5c30267830a9c8ff8fe9f89fe7 100644
--- a/src/ports/SkFontConfigInterface_android.cpp
+++ b/src/ports/SkFontConfigInterface_android.cpp
@@ -414,9 +414,7 @@ bool SkFontConfigInterfaceAndroid::matchFamilyName(const char familyName[],
     }
 
     if (INVALID_FAMILY_REC_ID == familyRecID) {
-        //TODO this ensures that we always return something
-        familyRecID = fDefaultFamilyRecID;
-        //return false;
+        return false;
     }
 
     FontRecID fontRecID = find_best_style(fFontFamilies[familyRecID], style);
@@ -495,6 +493,7 @@ SkTypeface* SkFontConfigInterfaceAndroid::getTypefaceForFontRec(FontRecID fontRe
             SkAssertResult(fFamilyNameDict.findKey(fontRec.fFamilyRecID, &familyName));
             SkASSERT(familyName);
             face = SkTypeface::CreateFromName(familyName, fontRec.fStyle);
+	    SkASSERT(face);

[reed1, 2013/09/18 19:51:37]

Why are we asserting here?

[djsollen, 2013/09/18 19:57:30]

This function takes fontRecID's which correspond to known fonts on the device
and creates a SkTypeface object around it.  Since we know the font exists and
what the name is then we expect it to succeed.  That being said we probably
don't need the assert here since it also exists later on in the function.

         }
 
         // store the result for subsequent lookups