diff options
| author | Martijn Coenen <maco@google.com> | 2014-05-30 14:55:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-30 14:55:25 +0000 |
| commit | c2e1dcd428e1959870f24bef254f17e4fa9eea36 (patch) | |
| tree | e6fc2c7d24e50f29f4151047121a6349a9ff645c /api | |
| parent | f5c06e23c4ee1ec89c0b06da7e87198cce9d1f76 (diff) | |
| parent | 748fca45fc6c6bc4729805fb13955d106b36f5ca (diff) | |
| download | frameworks_base-c2e1dcd428e1959870f24bef254f17e4fa9eea36.zip frameworks_base-c2e1dcd428e1959870f24bef254f17e4fa9eea36.tar.gz frameworks_base-c2e1dcd428e1959870f24bef254f17e4fa9eea36.tar.bz2 | |
am 65f8da7f: Merge "Address HCE API review comments." into lmp-preview-dev
* commit '65f8da7f640ef87797fe16d139caa26d55378ab6':
Address HCE API review comments.
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 e47fbbc..740e5d2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17716,25 +17716,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"; |