commit e07465fafd66a6e882890febcd688e04e6cf2c61
author Raph Levien <raph@google.com> Wed Aug 13 15:26:38 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 13 01:30:28 2014 +0000
tree 992b676421dcbdd09ae2edccb3f7e5db40af80be
parent 55b0abd75c4fe61d293846f55c3d9fe834a4d15a
parent ff86bcd08827d1050a8cfd99b521c21848b3f364

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

graphics/java/android/graphics/Typeface.java

diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java
index 0dc903a..06586ca 100644
--- a/graphics/java/android/graphics/Typeface.java
+++ b/graphics/java/android/graphics/Typeface.java
@@ -132,6 +132,9 @@
      * @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