diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-28 17:57:39 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-28 17:57:39 -0700 |
commit | f256c4001bfd65169158af854672df0eea234d54 (patch) | |
tree | 23ec0b15c1320d4387edbc56fce60f5f336ed8d1 /core | |
parent | bfefdcda94e056f6dee68debefb35ce9e7cd03b7 (diff) | |
parent | a62f16accad31e03ede5e4e6525dbe30dccc6db0 (diff) | |
download | frameworks_base-f256c4001bfd65169158af854672df0eea234d54.zip frameworks_base-f256c4001bfd65169158af854672df0eea234d54.tar.gz frameworks_base-f256c4001bfd65169158af854672df0eea234d54.tar.bz2 |
am a62f16ac: Merge change 8877 into donut
Merge commit 'a62f16accad31e03ede5e4e6525dbe30dccc6db0'
* commit 'a62f16accad31e03ede5e4e6525dbe30dccc6db0':
Remove warning in non-eng builds.
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/view/ViewDebug.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java index 46aea02..4baf612 100644 --- a/core/java/android/view/ViewDebug.java +++ b/core/java/android/view/ViewDebug.java @@ -16,6 +16,7 @@ package android.view; +import android.util.Config; import android.util.Log; import android.util.DisplayMetrics; import android.content.res.Resources; @@ -140,7 +141,9 @@ public class ViewDebug { public static boolean consistencyCheckEnabled = false; static { - Debug.setFieldsOn(ViewDebug.class, true); + if (Config.DEBUG) { + Debug.setFieldsOn(ViewDebug.class, true); + } } /** |