commit 5db1f5aaacf01e176f2463c212da72eaafc79165
author Derek Sollenberger <djsollen@google.com> Mon Sep 23 19:14:57 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 23 19:14:57 2013 +0000
tree e5165571b980306a437bff765d5fdb703ab9bb8b
parent 4bf0fcef9296b53114e86490d79956986f8b93a6
parent fe8e21fd80f0594f2be341643ef52d2095eda3b6

Merge "Fix Java API error where requesting another style for a provided family fails" into klp-dev

core/jni/android/graphics/Typeface.cpp

diff --git a/core/jni/android/graphics/Typeface.cpp b/core/jni/android/graphics/Typeface.cpp
index ff62fff..a7a0bb2 100644
--- a/core/jni/android/graphics/Typeface.cpp
+++ b/core/jni/android/graphics/Typeface.cpp
@@ -44,7 +44,13 @@
 }
 
 static SkTypeface* Typeface_createFromTypeface(JNIEnv* env, jobject, SkTypeface* family, int style) {
-    return SkTypeface::CreateFromTypeface(family, (SkTypeface::Style)style);
+    SkTypeface* face = SkTypeface::CreateFromTypeface(family, (SkTypeface::Style)style);
+    // return the default font at the best style if the requested style does not
+    // exist in the provided family
+    if (NULL == face) {
+        face = SkTypeface::CreateFromName(NULL, (SkTypeface::Style)style);
+    }
+    return face;
 }
 
 static void Typeface_unref(JNIEnv* env, jobject obj, SkTypeface* face) {