summaryrefslogtreecommitdiffstats
path: root/graphics/java
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-11-05 17:45:33 -0500
committerJohn Spurlock <jspurlock@google.com>2013-11-05 19:15:41 -0500
commitf68bb66c6ec239790ba18b8d078eb7ab4894fdc3 (patch)
tree7e5f7fe91eb18f538856aa883f32c0d86b0fc8dd /graphics/java
parent65d4a84b980583e068dd21bf11e5fe034df8d7ef (diff)
downloadframeworks_base-f68bb66c6ec239790ba18b8d078eb7ab4894fdc3.zip
frameworks_base-f68bb66c6ec239790ba18b8d078eb7ab4894fdc3.tar.gz
frameworks_base-f68bb66c6ec239790ba18b8d078eb7ab4894fdc3.tar.bz2
Fix recent regression in DrawableContainer.
Ensure optical insets are never null. Bug:11537082 Change-Id: Ib75be83909fac612ae947f501835285cd8a79862
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/graphics/drawable/DrawableContainer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java
index 60e2376..af8441a 100644
--- a/graphics/java/android/graphics/drawable/DrawableContainer.java
+++ b/graphics/java/android/graphics/drawable/DrawableContainer.java
@@ -60,7 +60,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
private long mExitAnimationEnd;
private Drawable mLastDrawable;
- private Insets mInsets;
+ private Insets mInsets = Insets.NONE;
// overrides from Drawable