commit 4a62374544152d9cc6dafd3e8dd9b0ba475a974c
author Romain Guy <romainguy@google.com> Mon Jan 07 11:31:48 2013 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 07 11:31:49 2013 -0800
tree 54703ccaa1cbf521734f14806d6ba19731e0b958
parent 31ffc5713913062c58854b1cc3556547f6681f65
parent 666d5daab2a679ac0575c3a24ef18a737592f1d8

Merge "Fix issue when toggling profiling from visual to off to visual"

core/java/android/view/HardwareRenderer.java

diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java
index 353e886..b1c1c4a 100644
--- a/core/java/android/view/HardwareRenderer.java
+++ b/core/java/android/view/HardwareRenderer.java
@@ -716,9 +716,7 @@
 
                 if (mProfileEnabled) {
                     Log.d(LOG_TAG, "Profiling hardware renderer");
-                }
 
-                if (mProfileEnabled) {
                     int maxProfileFrames = SystemProperties.getInt(PROFILE_MAXFRAMES_PROPERTY,
                             PROFILE_MAX_FRAMES);
                     mProfileData = new float[maxProfileFrames * PROFILE_FRAME_DATA_COUNT];
@@ -732,8 +730,7 @@
                     mProfileLock = null;
                 }
 
-                mProfileRects = null;
-                mProfilePaint = null;
+                mProfileCurrentFrame = -PROFILE_FRAME_DATA_COUNT;
             }
 
             value = SystemProperties.getBoolean(DEBUG_DIRTY_REGIONS_PROPERTY, false);