summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/view/View.java11
1 files changed, 1 insertions, 10 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 5559d4dbe705..0316506b94c4 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -3593,9 +3593,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
private int[] mDrawableState = null;
- /** Whether draw() is currently being called. */
- private boolean mInDraw = false;
-
ViewOutlineProvider mOutlineProvider = ViewOutlineProvider.BACKGROUND;
/**
@@ -16474,8 +16471,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*/
@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);
@@ -16520,7 +16515,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
onDrawForeground(canvas);
// we're done...
- mInDraw = false;
return;
}
@@ -16668,8 +16662,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
// Step 6, draw decorations (foreground, scrollbars)
onDrawForeground(canvas);
-
- mInDraw = false;
}
/**
@@ -17114,8 +17106,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*/
@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;