diff options
| author | Konstantin Lopyrev <klopyrev@google.com> | 2010-08-18 13:39:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-18 13:39:29 -0700 |
| commit | 28bd3a54ec192ed9259cf88873e387129103258e (patch) | |
| tree | d0c8f1c6b36bc075d6c3c7b59c780b95018d5110 | |
| parent | 25af9997b91a2cc5de8ffdaff072552492fb6312 (diff) | |
| parent | f2af87b39b294a197b9a7aaa611a14cfcd669a16 (diff) | |
| download | frameworks_base-28bd3a54ec192ed9259cf88873e387129103258e.zip frameworks_base-28bd3a54ec192ed9259cf88873e387129103258e.tar.gz frameworks_base-28bd3a54ec192ed9259cf88873e387129103258e.tar.bz2 | |
am f2af87b3: Merge "Making sure the draw time is measured." into gingerbread
Merge commit 'f2af87b39b294a197b9a7aaa611a14cfcd669a16' into gingerbread-plus-aosp
* commit 'f2af87b39b294a197b9a7aaa611a14cfcd669a16':
Making sure the draw time is measured.
| -rw-r--r-- | core/java/android/view/ViewDebug.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java index 2ca08ea..402443c 100644 --- a/core/java/android/view/ViewDebug.java +++ b/core/java/android/view/ViewDebug.java @@ -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 = |