1 files changed, 7 insertions, 25 deletions
diff --git a/java/src/com/android/i18n/addressinput/AddressField.java b/java/src/com/android/i18n/addressinput/AddressField.java
index b951021..17b1817 100644
--- a/java/src/com/android/i18n/addressinput/AddressField.java
+++ b/java/src/com/android/i18n/addressinput/AddressField.java
@@ -24,14 +24,14 @@ import java.util.Map;
  * formatting. Note that the metadata also has a character for newlines, which is not defined here.
  */
 public enum AddressField {
-    ADMIN_AREA('S', "state"),
-    LOCALITY('C', "city"),
-    RECIPIENT('N', "name"),
-    ORGANIZATION('O', "organization"),
+    ADMIN_AREA('S'),
+    LOCALITY('C'),
+    RECIPIENT('N'),
+    ORGANIZATION('O'),
     // Deprecated - use A instead.
-    ADDRESS_LINE_1('1', "street1"),
+    ADDRESS_LINE_1('1'),
     // Deprecated - use A instead.
-    ADDRESS_LINE_2('2', "street2"),
+    ADDRESS_LINE_2('2'),
     DEPENDENT_LOCALITY('D'),
     POSTAL_CODE('Z'),
     SORTING_CODE('X'),
@@ -58,15 +58,8 @@ public enum AddressField {
 
     private final char mField;
 
-    private final String mAttributeName;
-
-    private AddressField(char field, String attributeName) {
-        mField = field;
-        mAttributeName = attributeName;
-    }
-
     private AddressField(char field) {
-        this(field, null);
+        mField = field;
     }
 
     /**
@@ -78,17 +71,6 @@ public enum AddressField {
     }
 
     /**
-     * Gets attribute name. Attribute names are used as keys to JSON address data returned from the
-     * server. Returns null if the field does not have a corresponding attribute name.
-     *
-     * Note: Not all address fields have attribute names. Fields like postal code, country, sorting
-     * code, or street address do not have attribute names.
-     */
-    String getAttributeName() {
-        return mAttributeName;
-    }
-
-    /**
      * Gets the field's identification character, as used in the metadata.
      *
      * @return identification char.