fix issue on devices running an OS prior to 4.2 when the fallback font file was potential stored in…

src/ports/SkFontConfigParser_android.cpp

 /*
  * Copyright 2011 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 "SkFontConfigParser_android.h"
 #include "SkTDArray.h"
 #include "SkTypeface.h"
@@ skipping 145 matching lines @@
         // Disable the arbitrary text handler installed to load Name data
         XML_SetCharacterDataHandler(*familyData->parser, NULL);
     }
 }
 
 /**
  * This function parses the given filename and stores the results in the given
  * families array.
  */
 static void parseConfigFile(const char *filename, SkTDArray<FontFamily*> &families) {
+
+    FILE* file = NULL;
+
+#if !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)

[scroggo, 2013/08/27 19:14:01]

So this is only for Android, but not in the framework?

[djsollen, 2013/08/27 19:22:49]

This code will not be possible to run as part of the framework in versions prior
to 4.2 as they have already shipped. This guard just means we don't need to do
the extra work to reach that conclusion.

+    // if we are using a version of Android prior to Android 4.2 (JellyBean MR1
+    // at API Level 17) then we need to look for files with a different suffix.
+    char sdkVersion[PROP_VALUE_MAX];
+    __system_property_get("ro.build.version.sdk", sdkVersion);
+    const int sdkVersionInt = atoi(sdkVersion);
+
+    if (0 != *sdkVersion && sdkVersionInt < 17) {
+        SkString basename;
+        SkString updatedFilename;
+        SkString locale = SkFontConfigParser::GetLocale();

[scroggo, 2013/08/27 19:14:01]

could be const.

+
+        basename.set(filename);
+        // Remove the .xml suffix. We'll add it back in a moment.
+        if (basename.endsWith(".xml")) {
+            basename.resize(basename.size()-4);
+        }
+        // Try first with language and region
+        updatedFilename.printf("%s-%s.xml", basename.c_str(), locale.c_str());
+        file = fopen(updatedFilename.c_str(), "r");
+        if (!file) {
+            // If not found, try next with just language
+            updatedFilename.printf("%s-%.2s.xml", basename.c_str(), locale.c_str());
+            file = fopen(updatedFilename.c_str(), "r");
+        }
+    }
+#endif
+
+    if (NULL == file) {
+        file = fopen(filename, "r");
+    }
+
+    // Some of the files we attempt to parse (in particular, /vendor/etc/fallback_fonts.xml)
+    // are optional - failure here is okay because one of these optional files may not exist.
+    if (NULL == file) {
+        return;
+    }
+
     XML_Parser parser = XML_ParserCreate(NULL);
     FamilyData *familyData = new FamilyData(&parser, families);
     XML_SetUserData(parser, familyData);
     XML_SetElementHandler(parser, startElementHandler, endElementHandler);
-    FILE *file = fopen(filename, "r");
-    // Some of the files we attempt to parse (in particular, /vendor/etc/fallback_fonts.xml)
-    // are optional - failure here is okay because one of these optional files may not exist.
-    if (file == NULL) {
-        return;
-    }
+
     char buffer[512];
     bool done = false;
     while (!done) {
         fgets(buffer, sizeof(buffer), file);
         int len = strlen(buffer);
         if (feof(file) != 0) {
             done = true;
         }
         XML_Parse(parser, buffer, len, done);
     }
@@ skipping 87 matching lines @@
     SkString locale(6);
     char* localeCStr = locale.writable_str();
 
     strncpy(localeCStr, propLang, 2);
     localeCStr[2] = '-';
     strncpy(&localeCStr[3], propRegn, 2);
     localeCStr[5] = '\0';
 
     return locale;
 }