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

Commit 91703136 authored by Konstantin Lopyrev's avatar Konstantin Lopyrev Committed by Android Git Automerger
Browse files

am 28bd3a54: am f2af87b3: Merge "Making sure the draw time is measured." into gingerbread 

Merge commit '28bd3a54'

* commit '28bd3a54':
  Making sure the draw time is measured.
parents 96f32ea6 28bd3a54

core/java/android/view/ViewDebug.java

+2 −1
Original line number Diff line number Diff line
@@ -990,7 +990,8 @@ public class ViewDebug { 
                            }

                        }) : 0;

        long durationDraw =

                (root || (view.mPrivateFlags & View.DRAWN) != 0) ? profileViewOperation(view,

                (root || !view.willNotDraw() || (view.mPrivateFlags & View.DRAWN) != 0) ? profileViewOperation(

                        view,

                        new ViewOperation<Object>() {

                            public Object[] pre() {

                                final DisplayMetrics metrics =