Don\'t verify the scrollbar drawable am: a53c3b2197

am: ca6b87fea6

* commit 'ca6b87fea6b16e38f8bbbd514d3cf07361a5feba':
  Don't verify the scrollbar drawable

1 files changed, 4 insertions, 2 deletions

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index d85ea6538938..68869a5e50b9 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -16937,8 +16937,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
      */
     @CallSuper
     protected boolean verifyDrawable(Drawable who) {
-        return who == mBackground || (mScrollCache != null && mScrollCache.scrollBar == who)
-                || (mForegroundInfo != null && mForegroundInfo.mDrawable == who);
+        // Avoid verifying the scroll bar drawable so that we don't end up in
+        // an invalidation loop. This effectively prevents the scroll bar
+        // drawable from triggering invalidations and scheduling runnables.
+        return who == mBackground || (mForegroundInfo != null && mForegroundInfo.mDrawable == who);
     }
 
     /**