diff options
| author | Martijn Coenen <maco@google.com> | 2014-05-30 14:52:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-30 14:52:48 +0000 |
| commit | 748fca45fc6c6bc4729805fb13955d106b36f5ca (patch) | |
| tree | 078e45f0a6623fb4d29054512e424cf485948e05 /api | |
| parent | 4314f6d5fa088377ad5bfab9063352377e0c3fd1 (diff) | |
| parent | df48db3c7cab1e39ffe16738c070644c1ef66782 (diff) | |
| download | frameworks_base-748fca45fc6c6bc4729805fb13955d106b36f5ca.zip frameworks_base-748fca45fc6c6bc4729805fb13955d106b36f5ca.tar.gz frameworks_base-748fca45fc6c6bc4729805fb13955d106b36f5ca.tar.bz2 | |
Merge "Address HCE API review comments." into lmp-preview-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/api/current.txt b/api/current.txt index 9c56fb5..f67a01b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17648,25 +17648,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"; |