Merge "Display the correct expected name when loading the wrong adapter."

2010-09-28 10:35:09 -07:00
parent b0725a4aeb 5a86c4c385
commit a2a57aa02b
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/widget/Adapters.java
+++ b/core/java/android/widget/Adapters.java
@@ -545,7 +545,8 @@ public class Adapters {
            String name = parser.getName();
            if (assertName != null && !assertName.equals(name)) {
                throw new IllegalArgumentException("The adapter defined in " +
-                        c.getResources().getResourceEntryName(id) + " must be a <" + name + " />");
+                        c.getResources().getResourceEntryName(id) + " must be a <" +
+                        assertName + " />");
            }

            if (ADAPTER_CURSOR.equals(name)) {