summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-05-15 01:39:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-15 01:39:04 +0000
commitd76a81f5195b8a23b136f5a9965d3b5dd12a195d (patch)
tree8946085c63bcf62eec448e74736898de315c85dc /graphics
parentebb1d76e32535df04be5baab72fc067decf8ee15 (diff)
parent220239e37110bf7d97aa92270be5a12ab0cf5e24 (diff)
downloadframeworks_base-d76a81f5195b8a23b136f5a9965d3b5dd12a195d.zip
frameworks_base-d76a81f5195b8a23b136f5a9965d3b5dd12a195d.tar.gz
frameworks_base-d76a81f5195b8a23b136f5a9965d3b5dd12a195d.tar.bz2
Merge "Fix missing break in Icon class" into mnc-dev
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/drawable/Icon.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/Icon.java b/graphics/java/android/graphics/drawable/Icon.java
index 668a14a..0366246 100644
--- a/graphics/java/android/graphics/drawable/Icon.java
+++ b/graphics/java/android/graphics/drawable/Icon.java
@@ -228,6 +228,7 @@ public final class Icon implements Parcelable {
getResPackage()),
e);
}
+ break;
case TYPE_DATA:
return new BitmapDrawable(context.getResources(),
BitmapFactory.decodeByteArray(getDataBytes(), getDataOffset(), getDataLength())