Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88172fe4 authored by Chet Haase's avatar Chet Haase
Browse files

Restore save/restore calls removed recently 

Calls thought to be duplicates were removed, which caused rendering problems
for Browser as well as crashes in the widget list and music.

Change-Id: I6364aaa362619ea3dd368990304d61d84bbe2a90
parent a46c1df2

core/java/android/view/View.java

+6 −0
Original line number Diff line number Diff line
@@ -8563,6 +8563,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
                canvas.onPreDraw(mLocalDirtyRect);

                mLocalDirtyRect.setEmpty();



                final int restoreCount = canvas.save();



                computeScroll();

                canvas.translate(-mScrollX, -mScrollY);
@@ -8576,6 +8578,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
                    draw(canvas);

                }



                canvas.restoreToCount(restoreCount);

            } finally {

                canvas.onPostDraw();

                mHardwareLayer.end(currentCanvas);
@@ -8725,6 +8728,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
                // The dirty rect should always be null for a display list

                canvas.onPreDraw(null);



                final int restoreCount = canvas.save();



                computeScroll();

                canvas.translate(-mScrollX, -mScrollY);

                mPrivateFlags |= DRAWN | DRAWING_CACHE_VALID;
@@ -8737,6 +8742,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 
                    draw(canvas);

                }



                canvas.restoreToCount(restoreCount);

            } finally {

                canvas.onPostDraw();