commit a57ca45d5df0f79b9be408105d2ed1c34e128130
author Xavier Ducrohet <xav@android.com> Mon Jan 10 17:44:16 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 10 17:44:16 2011 -0800
tree 7de04b81aa5d608ddc5f4f09d5dababf9b85e16f
parent 9c3850f24e66d4c61337e749da843444cbb65d10
parent 419e8296ea76c5f1db1abbaa88b39b538fa42403

Merge "LayoutLib: move asserts around." into honeycomb

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java

diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java
index 886ef2a..4fb280d 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java
@@ -328,11 +328,12 @@
         }
 
         // looks like were unable to resolve the color value.
-        assert false;
         Bridge.getLog().warning(null, String.format(
                 "Unable to resolve color value \"%1$s\" in attribute \"%2$s\"",
                 value, mNames[index]));
 
+        assert false;
+
         return null;
     }
 
@@ -406,11 +407,12 @@
         }
 
         // looks like we were unable to resolve the dimension value
-        assert false;
         Bridge.getLog().warning(null, String.format(
                 "Unable to resolve dimension value \"%1$s\" in attribute \"%2$s\"",
                 s, mNames[index]));
 
+        assert false;
+
         return defValue;
     }
 
@@ -536,11 +538,12 @@
         }
 
         // looks like we were unable to resolve the fraction value
-        assert false;
         Bridge.getLog().warning(null, String.format(
                 "Unable to resolve fraction value \"%1$s\" in attribute \"%2$s\"",
                 value, mNames[index]));
 
+        assert false;
+
         return defValue;
     }
 
@@ -644,9 +647,11 @@
             return idValue.intValue();
         }
 
-        assert false;
         Bridge.getLog().warning(null, String.format(
                 "Unable to resolve id \"%1$s\" for attribute \"%2$s\"", value, mNames[index]));
+
+        assert false;
+
         return defValue;
     }
 
@@ -679,11 +684,12 @@
         }
 
         // looks like we were unable to resolve the drawable
-        assert false;
         Bridge.getLog().warning(null, String.format(
                 "Unable to resolve drawable \"%1$s\" in attribute \"%2$s\"", stringValue,
                 mNames[index]));
 
+        assert false;
+
         return null;
     }