Merge "Remove redundant computeScroll() call for hw-accelerated views"

Author: chethaase

core/java/android/view/View.java

@@ -12922,11 +12922,6 @@ boolean draw(Canvas canvas, ViewGroup parent, long drawingTime) {
             mPrivateFlags &= ~INVALIDATED;
         }
 
-        computeScroll();
-
-        final int sx = mScrollX;
-        final int sy = mScrollY;
-
         DisplayList displayList = null;
         Bitmap cache = null;
         boolean hasDisplayList = false;
@@ -12973,6 +12968,14 @@ boolean draw(Canvas canvas, ViewGroup parent, long drawingTime) {
             }
         }
 
+        int sx = 0;
+        int sy = 0;
+        if (!hasDisplayList) {
+            computeScroll();
+            sx = mScrollX;
+            sy = mScrollY;
+        }
+
         final boolean hasNoCache = cache == null || hasDisplayList;
         final boolean offsetForScroll = cache == null && !hasDisplayList &&
                 layerType != LAYER_TYPE_HARDWARE;