summaryrefslogtreecommitdiffstats
path: root/graphics/java/android
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@google.com>2014-08-21 16:01:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-21 16:01:54 +0000
commit9f6ba7af562a938e4765a224b412f2d0691f586a (patch)
tree2b2b801ccccc337c3ba9e4d623f46e2d371f913d /graphics/java/android
parent7a13ea7e3b080c7c40d76275f407a4fe45635f04 (diff)
parentbf8d5620f7f3be72ec217f4bcc14a417d4e1dee6 (diff)
downloadframeworks_base-9f6ba7af562a938e4765a224b412f2d0691f586a.zip
frameworks_base-9f6ba7af562a938e4765a224b412f2d0691f586a.tar.gz
frameworks_base-9f6ba7af562a938e4765a224b412f2d0691f586a.tar.bz2
Merge "Throw exception on nonexistent font" into lmp-dev
Diffstat (limited to 'graphics/java/android')
-rw-r--r--graphics/java/android/graphics/Typeface.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java
index 06586ca..568d3f2 100644
--- a/graphics/java/android/graphics/Typeface.java
+++ b/graphics/java/android/graphics/Typeface.java
@@ -188,7 +188,7 @@ public class Typeface {
return createFromFamiliesWithDefault(families);
}
}
- return null;
+ throw new RuntimeException("Font asset not found " + path);
}
/**
@@ -215,7 +215,7 @@ public class Typeface {
return createFromFamiliesWithDefault(families);
}
}
- return null;
+ throw new RuntimeException("Font not found " + path);
}
/**