diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/nfc/cardemulation/HostApduService.java | 4 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 |
4 files changed, 10 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 6589a4822cb8..3ea834a35632 100644 --- a/api/current.txt +++ b/api/current.txt @@ -289,6 +289,7 @@ package android { field public static final deprecated int animationResolution = 16843546; // 0x101031a field public static final int antialias = 16843034; // 0x101011a field public static final int anyDensity = 16843372; // 0x101026c + field public static final int apduServiceBanner = 16843755; // 0x10103eb field public static final int apiKey = 16843281; // 0x1010211 field public static final int author = 16843444; // 0x10102b4 field public static final int authorities = 16842776; // 0x1010018 diff --git a/core/java/android/nfc/cardemulation/HostApduService.java b/core/java/android/nfc/cardemulation/HostApduService.java index 615ef021e9bb..174acc0b92de 100644 --- a/core/java/android/nfc/cardemulation/HostApduService.java +++ b/core/java/android/nfc/cardemulation/HostApduService.java @@ -81,7 +81,7 @@ public abstract class HostApduService extends Service { * currently active on the logical channel). * * <p>Note that this next AID may still be resolved to this - * service, in which case {@link #processCommandApdu(byte[], int)} + * service, in which case {@link #processCommandApdu(byte[], Bundle)} * will be called again. */ public static final int DEACTIVATION_DESELECTED = 1; @@ -248,7 +248,7 @@ public abstract class HostApduService extends Service { * transaction. * * <p>Note: this method may be called anywhere between - * the first {@link #processCommandApdu(byte[], int)} + * the first {@link #processCommandApdu(byte[], Bundle)} * call and a {@link #onDeactivated(int)} call. */ public final void notifyUnhandled() { diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index f8cffa78e6be..cf23f7ab6db2 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -2611,6 +2611,9 @@ <!-- Whether the device must be unlocked before routing data to this service. The default is false.--> <attr name="requireDeviceUnlock" format="boolean"/> + <!-- A drawable that can be rendered in Android's system UI for representing + the service. --> + <attr name="apduServiceBanner" format="reference"/> </declare-styleable> <!-- Use <code>offhost-apdu-service</code> as the root tag of the XML resource that @@ -2621,6 +2624,9 @@ <!-- Short description of the functionality the service implements. This attribute is mandatory.--> <attr name="description" /> + <!-- A drawable that can be rendered in Android's system UI for representing + the service. --> + <attr name="apduServiceBanner"/> </declare-styleable> <!-- Specify one or more <code>aid-group</code> elements inside a diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 696e78296e07..dce2db0d775a 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2074,5 +2074,6 @@ <public type="attr" name="autoMirrored" /> <public type="attr" name="supportsSwitchingToNextInputMethod" /> <public type="attr" name="requireDeviceUnlock" /> + <public type="attr" name="apduServiceBanner" /> </resources> |