From 434249ef62dcb10ce3c0e0207435a23fb880e0ce Mon Sep 17 00:00:00 2001
From: Martijn Coenen <maco@google.com>
Date: Mon, 22 Jul 2013 19:47:57 -0700
Subject: [PATCH] Re-use "name" attribute for NFC AIDs.

Change-Id: I92895e0f21a639897c45ec184580c43ba8b22dca
---
 api/current.txt                | 1 -
 core/res/res/values/attrs.xml  | 2 +-
 core/res/res/values/public.xml | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 080c6f943e76..1a6928bab7b6 100644
--- a/api/current.txt
+++ b/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
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 181793fd6853..6a8381f00ace 100644
--- a/core/res/res/values/attrs.xml
+++ b/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>
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index e5fcfb08d271..7de27058fbff 100644
--- a/core/res/res/values/public.xml
+++ b/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>
-- 
2.11.0