From 1ca584a2bb5c0f0e747c98f2e930cce8b53421a5 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Fri, 18 Feb 2011 18:48:08 -0800 Subject: LayoutLib: remove assert in resource resolution. These code paths were valid in case there's a mismatch between the style/theme/version of Android Change-Id: I8cb3b2a3f3a1ef5c37ccec0c8ddbb7add69bfbe0 --- .../com/android/layoutlib/bridge/android/BridgeTypedArray.java | 8 -------- 1 file changed, 8 deletions(-) (limited to 'tools/layoutlib') 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 99c217d..c1d7600 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 @@ -345,8 +345,6 @@ public final class BridgeTypedArray extends TypedArray { Bridge.getLog().error(LayoutLog.TAG_RESOURCES_FORMAT, e.getMessage(), e, null /*data*/); } - assert false; - return null; } @@ -430,8 +428,6 @@ public final class BridgeTypedArray extends TypedArray { "\"%1$s\" in attribute \"%2$s\" is not a valid format.", s, mNames[index]), null /*data*/); - assert false; - return defValue; } @@ -569,8 +565,6 @@ public final class BridgeTypedArray extends TypedArray { "\"%1$s\" in attribute \"%2$s\" cannont be converted to a fraction.", value, mNames[index]), null /*data*/); - assert false; - return defValue; } @@ -686,8 +680,6 @@ public final class BridgeTypedArray extends TypedArray { "Unable to resolve id \"%1$s\" for attribute \"%2$s\"", value, mNames[index]), resValue); - assert false; - return defValue; } -- cgit v1.1