summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2014-05-20 13:52:14 -0700
committerMartijn Coenen <maco@google.com>2014-05-29 21:10:01 +0000
commitdf48db3c7cab1e39ffe16738c070644c1ef66782 (patch)
tree9ab50ae67a204db441995ff024a012471df35d1b /api
parent8d1de048d7612ec86ba01abc9f8b5eb7d2a2d6e2 (diff)
downloadframeworks_base-df48db3c7cab1e39ffe16738c070644c1ef66782.zip
frameworks_base-df48db3c7cab1e39ffe16738c070644c1ef66782.tar.gz
frameworks_base-df48db3c7cab1e39ffe16738c070644c1ef66782.tar.bz2
Address HCE API review comments.
Remove AidGroup from public APIs. Bug: 15089341 Change-Id: Ia8e038a12891abc6f1a8e82dbf30b8952e0b1fd7
Diffstat (limited to 'api')
-rw-r--r--api/current.txt16
1 files changed, 3 insertions, 13 deletions
diff --git a/api/current.txt b/api/current.txt
index df908e0..c1a58d2 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -17647,25 +17647,15 @@ package android.nfc {
package android.nfc.cardemulation {
- public final class AidGroup implements android.os.Parcelable {
- ctor public AidGroup(java.util.ArrayList<java.lang.String>, java.lang.String);
- method public int describeContents();
- method public java.util.ArrayList<java.lang.String> getAids();
- method public java.lang.String getCategory();
- method public void writeToParcel(android.os.Parcel, int);
- field public static final android.os.Parcelable.Creator CREATOR;
- field public static final int MAX_NUM_AIDS = 256; // 0x100
- }
-
public final class CardEmulation {
method public boolean categoryAllowsForegroundPreference(java.lang.String);
- method public android.nfc.cardemulation.AidGroup getAidGroupForService(android.content.ComponentName, java.lang.String);
+ method public java.util.List<java.lang.String> getAidsForService(android.content.ComponentName, java.lang.String);
method public static synchronized android.nfc.cardemulation.CardEmulation getInstance(android.nfc.NfcAdapter);
method public int getSelectionModeForCategory(java.lang.String);
method public boolean isDefaultServiceForAid(android.content.ComponentName, java.lang.String);
method public boolean isDefaultServiceForCategory(android.content.ComponentName, java.lang.String);
- method public boolean registerAidGroupForService(android.content.ComponentName, android.nfc.cardemulation.AidGroup);
- method public boolean removeAidGroupForService(android.content.ComponentName, java.lang.String);
+ method public boolean registerAidsForService(android.content.ComponentName, java.lang.String, java.util.List<java.lang.String>);
+ method public boolean removeAidsForService(android.content.ComponentName, java.lang.String);
method public boolean setPreferredService(android.app.Activity, android.content.ComponentName);
method public boolean unsetPreferredService(android.app.Activity);
field public static final java.lang.String ACTION_CHANGE_DEFAULT = "android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT";