Merge "Re-use "name" attribute for NFC AIDs."

api/current.txt

@@ -259,7 +259,6 @@ package android {
     field public static final int addPrintersActivity = 16843747; // 0x10103e3
     field public static final int addStatesFromChildren = 16842992; // 0x10100f0
     field public static final int adjustViewBounds = 16843038; // 0x101011e
-    field public static final int aid = 16843750; // 0x10103e6
     field public static final int alertDialogIcon = 16843605; // 0x1010355
     field public static final int alertDialogStyle = 16842845; // 0x101005d
     field public static final int alertDialogTheme = 16843529; // 0x1010309

core/res/res/values/attrs.xml

@@ -2598,7 +2598,7 @@
          element to list the ISO7816 Application ID (AIDs) your service can handle.-->
     <declare-styleable name="AidFilter">
         <!-- The ISO7816 Application ID -->
-        <attr name="aid" format="string" />
+        <attr name="name" />
         <!-- Short description of what the AID implements.-->
         <attr name="description" />
     </declare-styleable>

core/res/res/values/public.xml

@@ -2069,5 +2069,4 @@
   <public type="attr" name="addPrintersActivity" />
   <public type="attr" name="vendor" />
   <public type="attr" name="paymentService" />
-  <public type="attr" name="aid" />
 </resources>