commit d23f1eb0cd9893395573a4059be195e8fdb1007a
author Selim Cinek <cinek@google.com> Wed Jan 13 23:01:13 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 13 23:01:13 2016 +0000
tree abaaf54bcbe2892bb6974360e2b0966f6ea1faf0
parent 624d43b66f039e3b0f33274486512621919d96a3
parent ba9e8586e3eb32f8a33695964da0bdf8eab13da9

Merge "Fixed a crash with the heads up manager" into mnc-dr1.5-dev

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 5f8d49d..dea004e 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -3481,9 +3481,6 @@
 
     private int[] mDrawableState = null;
 
-    /** Whether draw() is currently being called. */
-    private boolean mInDraw = false;
-
     ViewOutlineProvider mOutlineProvider = ViewOutlineProvider.BACKGROUND;
 
     /**
@@ -16154,8 +16151,6 @@
      */
     @CallSuper
     public void draw(Canvas canvas) {
-        mInDraw = true;
-
         final int privateFlags = mPrivateFlags;
         final boolean dirtyOpaque = (privateFlags & PFLAG_DIRTY_MASK) == PFLAG_DIRTY_OPAQUE &&
                 (mAttachInfo == null || !mAttachInfo.mIgnoreDirtyState);
@@ -16200,7 +16195,6 @@
             onDrawForeground(canvas);
 
             // we're done...
-            mInDraw = false;
             return;
         }
 
@@ -16348,8 +16342,6 @@
 
         // Step 6, draw decorations (foreground, scrollbars)
         onDrawForeground(canvas);
-
-        mInDraw = false;
     }
 
     /**
@@ -16794,8 +16786,7 @@
      */
     @Override
     public void invalidateDrawable(@NonNull Drawable drawable) {
-        // Don't invalidate if a drawable changes during drawing.
-        if (verifyDrawable(drawable) && !mInDraw) {
+        if (verifyDrawable(drawable)) {
             final Rect dirty = drawable.getDirtyBounds();
             final int scrollX = mScrollX;
             final int scrollY = mScrollY;