am c2a5903e: Merge "Resolve invalid Typeface style to default" into lmp-dev

* commit 'c2a5903ecd76afdc33a088ce55620dc73e7c9d68': Resolve invalid Typeface style to default
2014-08-13 15:33:14 +00:00
parent 4d02366538 e07465fafd
commit 179c9a2e29
1 changed files with 3 additions and 0 deletions
--- a/graphics/java/android/graphics/Typeface.java
+++ b/graphics/java/android/graphics/Typeface.java
@@ -132,6 +132,9 @@ public class Typeface {
     * @return The best matching typeface.
     */
    public static Typeface create(Typeface family, int style) {
+        if (style < 0 || style > 3) {
+            style = 0;
+        }
        long ni = 0;
        if (family != null) {
            // Return early if we're asked for the same face/style