Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '5db1f5aaacf01e176f2463c212da72eaafc79165':
  Fix Java API error where requesting another style for a provided family fails
This commit is contained in:
Derek Sollenberger
2013-09-23 18:59:24 -07:00
committed by Android Git Automerger
parent dc655c0e07 5db1f5aaac
commit fad41c8fd1
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/jni/android/graphics/Typeface.cpp
View File

@@ -44,7 +44,13 @@ static SkTypeface* Typeface_create(JNIEnv* env, jobject, jstring name,
} }
static SkTypeface* Typeface_createFromTypeface(JNIEnv* env, jobject, SkTypeface* family, int style) { 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) { static void Typeface_unref(JNIEnv* env, jobject obj, SkTypeface* face) {