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

src/ports/SkFontConfigInterface_android.cpp

 
 /*
  * Copyright 2013 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontConfigInterface.h"
 #include "SkTypeface_android.h"
@@ skipping 395 matching lines @@
     if (NULL != familyName) {
         SkAutoAsciiToLC tolc(familyName);
         if (fFamilyNameDict.find(tolc.lc(), &familyRecID)) {
             exactNameMatch = true;
         }
     } else {
         familyRecID = fDefaultFamilyRecID;
 
     }
 
+    // If no matching family name is found then return false. This allows clients
+    // to be able to search for other fonts instead of forcing them to use the
+    // default font.
     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);
     FontRec& fontRec = fFonts[fontRecID];
 
     if (NULL != outFontIdentifier) {
         outFontIdentifier->fID = fontRecID;
         outFontIdentifier->fTTCIndex = 0;
         outFontIdentifier->fString.set(fontRec.fFileName);
 //        outFontIdentifier->fStyle = fontRec.fStyle;
@@ skipping 404 matching lines @@
     return SkCreateTypefaceForScriptNG(getHBScriptFromHBScriptOld(script), style, fontVariant);
 }
 
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkFontMgr* SkFontMgr::Factory() {
     return NULL;
 }