am 0249c83e: am 31a69fdb: throw if we have a null typeface native instance (so we don\'t crash in native code) we may still have to native-destroy a Typeface with a null ref, so check for that

Merge commit '0249c83ed014cc6a36caac30e55db62c29c204e2'

* commit '0249c83ed014cc6a36caac30e55db62c29c204e2':
  throw if we have a null typeface native instance (so we don't crash in native code)

core/jni/android/graphics/Typeface.cpp

@@ -46,7 +46,7 @@ static SkTypeface* Typeface_createFromTypeface(JNIEnv* env, jobject, SkTypeface*
 }
  
 static void Typeface_unref(JNIEnv* env, jobject obj, SkTypeface* face) {
-    face->unref();
+    SkSafeUnref(face);
 }
 
 static int Typeface_getStyle(JNIEnv* env, jobject obj, SkTypeface* face) {

graphics/java/android/graphics/Typeface.java

@@ -143,6 +143,9 @@ public class Typeface {
 
     // don't allow clients to call this directly
     private Typeface(int ni) {
+        if (0 == ni) {
+            throw new RuntimeException("native typeface cannot be made");
+        }
         native_instance = ni;
     }